summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsource4/script/tests/test_local.sh14
-rw-r--r--source4/torture/torture.c1
2 files changed, 15 insertions, 0 deletions
diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh
index 5994634418..0a8f9d6467 100755
--- a/source4/script/tests/test_local.sh
+++ b/source4/script/tests/test_local.sh
@@ -21,9 +21,23 @@ incdir=`dirname $0`
# the local tests don't need smbd
SMBD_TEST_FIFO=""
export SMBD_TEST_FIFO
+skipped="LOCAL-RESOLVE LOCAL-REGISTRY"
+
+echo "WARNING: Skipping $skipped"
failed=0
for t in $local_tests; do
+ skip=0
+ for s in $skipped; do
+ if [ x"$s" = x"$t" ]; then
+ skip=1;
+ break;
+ fi
+ done
+ if [ $skip = 1 ]; then
+ continue;
+ fi
+
name="$t"
testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
done
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 4befd2c043..df25fdce74 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -48,6 +48,7 @@ struct torture_context *torture_context_init(TALLOC_CTX *mem_ctx,
struct torture_context *torture = talloc_zero(mem_ctx,
struct torture_context);
torture->ui_ops = ui_ops;
+ torture->returncode = true;
return torture;
}