Skip to content

Commit

Permalink
build: only run symbol checking if running all tests
Browse files Browse the repository at this point in the history
this makes it much faster to run 1 test

Pair-Programmed-With: Amitay Isaacs <[email protected]>
  • Loading branch information
Andrew Tridgell committed Nov 10, 2011
1 parent 58457e6 commit a04eac7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions selftest/wscript
Original file line number Diff line number Diff line change
Expand Up @@ -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')

0 comments on commit a04eac7

Please sign in to comment.