Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 12:25:22 +0000 (14:25 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 12:25:22 +0000 (14:25 +0200)
source/selftest/samba4_tests.sh
source/torture/config.mk

index 3b61a974590b71514e091ad5a0da6c976237c901..725fde2c7d45c68ccd48c133829a38f4a537bf9b 100755 (executable)
@@ -288,7 +288,7 @@ done
 
 DATADIR=$samba4srcdir/../testdata
 
-plantest "js.samba3sam" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
+plantest "js.samba3sam" none $samba4bindir/smbscript $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
 
 # Domain Member Tests
 
index c2ec7c573a77da6b534ae58b94b6d44d7945a4c4..2f3fa38863f8f371dce974d43b128497ea5a2057 100644 (file)
@@ -313,19 +313,21 @@ locktest_OBJ_FILES = torture/locktest.o
 
 MANPAGES += torture/man/locktest.1
 
+GCOV=0
+
 ifeq ($(MAKECMDGOALS),gcov)
-GCOV?=1
+GCOV=1
 endif
 
 ifeq ($(MAKECMDGOALS),lcov)
-GCOV?=1
+GCOV=1
 endif
 
 ifeq ($(MAKECMDGOALS),testcov-html)
-GCOV?=1
+GCOV=1
 endif
 
-ifdef GCOV
+ifeq ($(GCOV),1)
 CFLAGS += --coverage
 LDFLAGS += --coverage
 endif