diff options
| author | James Zern <jzern@google.com> | 2022-06-02 19:38:03 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2022-06-02 21:51:20 -0700 |
| commit | 9546c699fb06a8e0f0c92be92159034a28005ac2 (patch) | |
| tree | 76dbaa4ea63d0091a43dd6980b340fe8ca8d642d /libs.mk | |
| parent | 7bddf81451edc23ea6c3715edd869f05c7499bf8 (diff) | |
| download | libvpx-9546c699fb06a8e0f0c92be92159034a28005ac2.tar libvpx-9546c699fb06a8e0f0c92be92159034a28005ac2.tar.gz libvpx-9546c699fb06a8e0f0c92be92159034a28005ac2.tar.bz2 libvpx-9546c699fb06a8e0f0c92be92159034a28005ac2.zip | |
libs.mk,build/make/Makefile: make test targets ordinary rules
this fixes a regression in make 4.2 and still present in 4.3 causing
double colon rules to be serialized which breaks sharding done by the
test and test-no-data-check rules. these targets only define one set of
rules so ordinary rules work unlike clean. install may be another
candidate, but that's left for a follow up.
Change-Id: I9f074eca2ad266eeca6e31aae2e9f31eec8680e0
Tested: make 3.81, 4.1, 4.2, 4.2.1, 4.3
Diffstat (limited to 'libs.mk')
| -rw-r--r-- | libs.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -536,7 +536,7 @@ $(LIBVPX_TEST_DATA): $(SRC_PATH_BARE)/test/test-data.sha1 esac \ ) -testdata:: $(LIBVPX_TEST_DATA) +testdata: $(LIBVPX_TEST_DATA) $(qexec)[ -x "$$(which sha1sum)" ] && sha1sum=sha1sum;\ [ -x "$$(which shasum)" ] && sha1sum=shasum;\ [ -x "$$(which sha1)" ] && sha1sum=sha1;\ @@ -709,15 +709,15 @@ INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(TEST_INTRA_PRED_SPEED_SRCS) INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(RC_INTERFACE_TEST_SRCS) define test_shard_template -test:: test_shard.$(1) -test-no-data-check:: test_shard_ndc.$(1) +test: test_shard.$(1) +test-no-data-check: test_shard_ndc.$(1) test_shard.$(1) test_shard_ndc.$(1): $(LIBVPX_TEST_BIN) @set -e; \ export GTEST_SHARD_INDEX=$(1); \ export GTEST_TOTAL_SHARDS=$(2); \ $(LIBVPX_TEST_BIN) test_shard.$(1): testdata -.PHONY: test_shard.$(1) +.PHONY: test_shard.$(1) test_shard_ndc.$(1) endef NUM_SHARDS := 10 |