From 5bb7371ca655329334d7b51469372a1dbc8f0f6d Mon Sep 17 00:00:00 2001 From: Andrew Kryczka Date: Fri, 12 Feb 2016 10:49:35 -0800 Subject: [PATCH] [build] Evaluate test names only when db_test exists Summary: as titled, this will prevent the error that was printed because test_names was evaluated before db_test was built. Test Plan: verified below command works and no longer prints errors: $ make release -j32 verified below command still finds the right tests: $ make J=32 parallel_check Reviewers: igor Reviewed By: igor Subscribers: dhruba, leveldb Differential Revision: https://reviews.facebook.net/D54117 --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6d4e48d4e..7399ff6a7 100644 --- a/Makefile +++ b/Makefile @@ -644,8 +644,6 @@ parloop: exit $$ret_bad; endif -all_tests:=$(shell $(test_names)) - parallel_check: $(TESTS) $(AM_V_GEN)if test "$(J)" > 1 \ && (parallel --gnu --help 2>/dev/null) | \ @@ -659,7 +657,7 @@ parallel_check: $(TESTS) echo $(J);\ echo Test Dir: $(TMPD); \ seq $(J) | parallel --gnu 's=$(TMPD)/rdb-{}; rm -rf $$s; mkdir $$s'; \ - $(MAKE) PAR_TEST="$(all_tests)" TMPD=$(TMPD) \ + $(MAKE) PAR_TEST="$(shell $(test_names))" TMPD=$(TMPD) \ J=$(J) db_test=1 parloop; \ $(MAKE) PAR_TEST="$(filter-out db_test, $(TESTS))" \ TMPD=$(TMPD) J=$(J) db_test=0 parloop; -- GitLab