[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-233-g8d9812b

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  8d9812bada2801f93eb47270287b3c083a3e9df8 (commit)
       via  12fa30765361ed9b2e80951baa739ae4aba3fffe (commit)
       via  052edb786418f161272a41025f8b6eee93bb433d (commit)
      from  3f46eb95e47828ba1db236d584933c997cb0c170 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 8d9812bada2801f93eb47270287b3c083a3e9df8
Merge: 12fa30765361ed9b2e80951baa739ae4aba3fffe 3f46eb95e47828ba1db236d584933c997cb0c170
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 17 14:25:22 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

commit 12fa30765361ed9b2e80951baa739ae4aba3fffe
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 17 14:23:50 2008 +0200

    Run samba3sam.js with bin/smbscript explicitly.
    
    Andrew Bartlett

commit 052edb786418f161272a41025f8b6eee93bb433d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 17 14:20:46 2008 +0200

    Fix build not to always use code coverage.
    
    Somehow, the way this was structured before always did a gcov build.
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 source/selftest/samba4_tests.sh |    2 +-
 source/torture/config.mk        |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 3b61a97..725fde2 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/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/source/torture/config.mk b/source/torture/config.mk
index c2ec7c5..2f3fa38 100644
--- a/source/torture/config.mk
+++ b/source/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


-- 
Samba Shared Repository