From dc68427b0e1691db6a52f9eb5e77c42755eea2b2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 19 Mar 2010 10:37:01 +1100
Subject: build: fixed st_done test completion code

---
 source4/selftest/wscript       | 7 ++++---
 source4/selftest/wscript_build | 3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 source4/selftest/wscript_build

(limited to 'source4/selftest')

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
-
-- 
cgit