summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-04-28 05:20:01 +0000
committerTim Potter <tpot@samba.org>2003-04-28 05:20:01 +0000
commit322d385b6e67dd8add75bce7db093e443bce729a (patch)
tree90fd1c03270c0ec9be5c8222a5e4bf4bdff9925a
parent4ea3cd2629592b5e306df64c998d220478d7f049 (diff)
downloadsamba-322d385b6e67dd8add75bce7db093e443bce729a.tar.gz
samba-322d385b6e67dd8add75bce7db093e443bce729a.tar.bz2
samba-322d385b6e67dd8add75bce7db093e443bce729a.zip
Merge stf updates from HEAD.
(This used to be commit 20bde94eb881009128794283a1d7537bbc62e268)
-rw-r--r--source3/Makefile.in7
-rw-r--r--source3/stf/standardcheck.py4
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index fbe5b6afab..1babe1d3da 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1354,6 +1354,7 @@ check: check-programs
PATH="`pwd`/bin:$$PATH" \
python stf/standardcheck.py
-# These are called by the test suite
-check-programs: bin/t_strcmp bin/t_push_ucs2 bin/smbcontrol
-
+# These are called by the test suite and need to be built before
+# running it. For the time being we don't build all of BIN_PROGS,
+# because they're not all needed.
+check-programs: bin/t_strcmp bin/t_push_ucs2 bin/smbcontrol bin/t_snprintf
diff --git a/source3/stf/standardcheck.py b/source3/stf/standardcheck.py
index bec21b8ec5..e3292353e8 100644
--- a/source3/stf/standardcheck.py
+++ b/source3/stf/standardcheck.py
@@ -22,13 +22,13 @@
"""These tests are run by Samba's "make check"."""
import strings, comfychair
-import smbcontrol
+import smbcontrol, sambalib
# There should not be any actual tests in here: this file just serves
# to define the ones run by default. They're imported from other
# modules.
-tests = strings.tests + smbcontrol.tests
+tests = strings.tests + smbcontrol.tests + sambalib.tests
if __name__ == '__main__':
comfychair.main(tests)