diff options
| author | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-01-15 13:58:47 +0000 |
|---|---|---|
| committer | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-01-15 13:58:47 +0000 |
| commit | 9788383a6c08189564cd18a824aab4ccdbe57a21 (patch) | |
| tree | e93ab7b1007d79e951f69a1495ac7e474536eb25 /source3/script | |
| parent | 011e89c85868ec8f16e475a560a0e5bd41995920 (diff) | |
| parent | 97f61b542c0e6b1f25ed08fa36792fd90a981e0e (diff) | |
| download | samba-9788383a6c08189564cd18a824aab4ccdbe57a21.tar.gz samba-9788383a6c08189564cd18a824aab4ccdbe57a21.tar.bz2 samba-9788383a6c08189564cd18a824aab4ccdbe57a21.zip | |
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 3a61e663e51fe620225691bc8673bf8800a36f47)
Diffstat (limited to 'source3/script')
| -rwxr-xr-x | source3/script/fix_bool.pl | 19 | ||||
| -rwxr-xr-x | source3/script/tests/selftest.sh | 1 | ||||
| -rwxr-xr-x | source3/script/tests/test_local_s3.sh | 2 | ||||
| -rwxr-xr-x | source3/script/tests/test_posix_s3.sh | 2 | ||||
| -rwxr-xr-x | source3/script/tests/test_wbinfo_s3.sh | 2 |
5 files changed, 24 insertions, 2 deletions
diff --git a/source3/script/fix_bool.pl b/source3/script/fix_bool.pl new file mode 100755 index 0000000000..c09645de7c --- /dev/null +++ b/source3/script/fix_bool.pl @@ -0,0 +1,19 @@ +#!/usr/bin/perl -w + +open(INFILE, "$ARGV[0]") || die $@; +open(OUTFILE, ">$ARGV[0].new") || die $@; + +while (<INFILE>) { + $_ =~ s/True/true/; + $_ =~ s/False/false/; + print OUTFILE "$_"; +} + +close(INFILE); +close(OUTFILE); + +rename("$ARGV[0].new", "$ARGV[0]") || die @_; + +exit(0); + + diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index 86abb15ed1..08bfdf601c 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -186,6 +186,7 @@ cat >$SERVERCONFFILE<<EOF map hidden = yes map system = yes create mask = 755 + vfs objects = $BINDIR/ea_tdb.so [hideunread] copy = tmp hide unreadable = yes diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh index 6117106c8a..fd8f98ccab 100755 --- a/source3/script/tests/test_local_s3.sh +++ b/source3/script/tests/test_local_s3.sh @@ -21,6 +21,6 @@ testit "replacetort" $VALGRIND $BINDIR/replacetort || \ failed=`expr $failed + 1` testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \ - failed=`expr $failed +1` + failed=`expr $failed + 1` testok $0 $failed diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh index 9f672897ac..0b4a52d4b5 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -47,7 +47,7 @@ unix="UNIX-INFO2" tests="$base $raw $rpc $unix" skipped="BASE-CHARSET BASE-DELAYWRITE BASE-TCONDEV" -skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS" +skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT" skipped="$skipped RAW-IOCTL" skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH" skipped="$skipped RAW-SFILEINFO RAW-STREAMS" diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh index 6a8faa1f87..01eed6ead6 100755 --- a/source3/script/tests/test_wbinfo_s3.sh +++ b/source3/script/tests/test_wbinfo_s3.sh @@ -35,6 +35,8 @@ tests="$tests:--name-to-sid=$username" #Didn't pass yet# tests="$tests:--user-info=$username" tests="$tests:--user-groups=$username" +failed=0 + OLDIFS=$IFS NEWIFS=$':' IFS=$NEWIFS |