GNUmakefile: tweak wasip1 and wasip2 rules

GNUmakefile

@@ -388,14 +388,6 @@ TEST_PACKAGES_WINDOWS := \
  text/template/parse \
  $(nil)
 
-TEST_PACKAGES_WASIP2_GAP := \
- compress/lzw \
- compress/zlib \
- internal/profile \
- math \
- math/cmplx \
- os
-
 # Report platforms on which each standard library package is known to pass tests
 jointmp := $(shell echo /tmp/join.$$$$)
 report-stdlib-tests-pass:
@@ -452,8 +444,6 @@ tinygo-test-wasip2-slow:
  $(TINYGO) test -target=wasip2 $(TEST_PACKAGES_SLOW)
 tinygo-test-wasip2-fast:
  $(TINYGO) test -target=wasip2 $(TEST_PACKAGES_FAST) ./tests/runtime_wasi
-tinygo-test-wasip2-gap:
- $(TINYGO) test -target=wasip2 $(TEST_PACKAGES_WASIP2_GAP)
 
 tinygo-test-wasip2-wip:
  $(TINYGO) test -target wasip2 -x -v $(TEST_PACKAGES_FAST) ./tests/runtime_wasi
@@ -471,17 +461,16 @@ tinygo-test-wasip2-sum-fast:
  TESTOPTS="-x -work" \
  PACKAGES="$(TEST_PACKAGES_FAST)" \
  gotestsum --raw-command -- ./tools/tgtestjson.sh
-tinygo-test-wasip2-sum-gap:
- TINYGO=$(TINYGO) \
- TARGET=wasip2 \
- TESTOPTS="-x -work" \
- PACKAGES="$(TEST_PACKAGES_WASIP2_GAP)" \
- gotestsum --raw-command -- ./tools/tgtestjson.sh 
-tinygo-bench-wasi:
+tinygo-bench-wasip1:
  $(TINYGO) test -target wasip1 -bench . $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_SLOW)
-tinygo-bench-wasi-fast:
+tinygo-bench-wasip1-fast:
  $(TINYGO) test -target wasip1 -bench . $(TEST_PACKAGES_FAST)
 
+tinygo-bench-wasip2:
+ $(TINYGO) test -target wasip2 -bench . $(TEST_PACKAGES_FAST) $(TEST_PACKAGES_SLOW)
+tinygo-bench-wasip2-fast:
+ $(TINYGO) test -target wasip2 -bench . $(TEST_PACKAGES_FAST)
+
 # Test external packages in a large corpus.
 test-corpus:
  CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=1h -buildmode exe -tags byollvm -run TestCorpus . -corpus=testdata/corpus.yaml