diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-19 10:37:01 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:53 +1000 |
| commit | dc68427b0e1691db6a52f9eb5e77c42755eea2b2 (patch) | |
| tree | d576a1be5ad957fdf58cac67841eab04813e4cf6 /source4/selftest | |
| parent | be4c0aa59116ca2696f498b46b12e4d79cbd0f2a (diff) | |
| download | samba-dc68427b0e1691db6a52f9eb5e77c42755eea2b2.tar.gz samba-dc68427b0e1691db6a52f9eb5e77c42755eea2b2.tar.bz2 samba-dc68427b0e1691db6a52f9eb5e77c42755eea2b2.zip | |
build: fixed st_done test completion code
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/wscript | 7 | ||||
| -rw-r--r-- | source4/selftest/wscript_build | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source4/selftest/wscript b/source4/selftest/wscript index 98b9a3924d..e1a59aceed 100644 --- a/source4/selftest/wscript +++ b/source4/selftest/wscript @@ -70,19 +70,20 @@ def cmd_testonly(opt): if os.path.exists(st_done): os.unlink(st_done) - cmd = '(PYTHON=/usr/bin/python perl -W ../selftest/selftest.pl --prefix=./st --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} | ${FILTER_OPTIONS}) && touch st/st_done' + cmd = '(PYTHON=/usr/bin/python perl -W ../selftest/selftest.pl --prefix=./st --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} && touch st/st_done) | ${FILTER_OPTIONS}' + # recursively expand variables while cmd.find('${') != -1: cmd = Utils.subst_vars(cmd, env) print "test: running %s" % cmd ret = os.system(cmd) if ret != 0: - print("test failed with exit code %d" % ret) + print("ERROR: test failed with exit code %d" % ret) sys.exit(ret) if not os.path.exists(st_done): - print("test command failed to complete") + print("ERROR: test command failed to complete") sys.exit(1) diff --git a/source4/selftest/wscript_build b/source4/selftest/wscript_build deleted file mode 100644 index 696f2c3d0f..0000000000 --- a/source4/selftest/wscript_build +++ /dev/null @@ -1,3 +0,0 @@ -# AUTOGENERATED by mktowscript.pl from ../../source4/selftest/config.mk -# Please remove this notice if hand editing - |