From a04eac7aa2f5f9388cf92a8a79e0bd6938f8fd22 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Nov 2011 13:08:37 +1100 Subject: [PATCH] build: only run symbol checking if running all tests this makes it much faster to run 1 test Pair-Programmed-With: Amitay Isaacs --- Makefile | 8 ++++---- selftest/wscript | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 05520523321..3b40c73d957 100644 --- a/Makefile +++ b/Makefile @@ -13,20 +13,20 @@ uninstall: $(WAF) uninstall test: - $(WAF) test --dup-symbol-check $(TEST_OPTIONS) + $(WAF) test $(TEST_OPTIONS) help: @echo NOTE: to run extended waf options use $(WAF_BINARY) or modify your PATH $(WAF) --help subunit-test: - $(WAF) test --dup-symbol-check --filtered-subunit $(TEST_OPTIONS) + $(WAF) test --filtered-subunit $(TEST_OPTIONS) testenv: - $(WAF) test --dup-symbol-check --testenv $(TEST_OPTIONS) + $(WAF) test --testenv $(TEST_OPTIONS) quicktest: - $(WAF) test --dup-symbol-check --quick $(TEST_OPTIONS) + $(WAF) test --quick $(TEST_OPTIONS) dist: touch .tmplock diff --git a/selftest/wscript b/selftest/wscript index 4d3d8f2841f..b469709a8a7 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -205,5 +205,12 @@ def cmd_testonly(opt): # main test entry point def cmd_test(opt): '''Run the test suite (see test options below)''' + + # if running all tests, then force a symbol check + env = LOAD_ENVIRONMENT() + CHECK_MAKEFLAGS(env) + if not Options.options.TESTS: + Options.options.DUP_SYMBOLCHECK = True + Scripting.commands.append('build') Scripting.commands.append('testonly') -- 2.34.1