diff options
| -rwxr-xr-x | source4/selftest/samba4_tests.sh | 2 | ||||
| -rw-r--r-- | source4/torture/config.mk | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 3b61a97459..725fde2c7d 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -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 diff --git a/source4/torture/config.mk b/source4/torture/config.mk index c2ec7c573a..2f3fa38863 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -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 |