summaryrefslogtreecommitdiff
path: root/source4/script/tests
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-11 00:40:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:19:33 -0500
commit16e8e96ba8e71b2877b738ac7d3fd45917e6444a (patch)
treee44410a1e0984232b7d06a44c6f7a14e79d89150 /source4/script/tests
parent3fb52d1b6e8fc31d2d9987997b901e85cdd2281a (diff)
downloadsamba-16e8e96ba8e71b2877b738ac7d3fd45917e6444a.tar.gz
samba-16e8e96ba8e71b2877b738ac7d3fd45917e6444a.tar.bz2
samba-16e8e96ba8e71b2877b738ac7d3fd45917e6444a.zip
r8300: get the js include path right in selftest
(This used to be commit 0e9e541e1e737f35200d64b31ddb4d468ff19518)
Diffstat (limited to 'source4/script/tests')
-rwxr-xr-xsource4/script/tests/selftest.sh2
-rwxr-xr-xsource4/script/tests/test_ejs.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index 5e94ea13e2..7f49b98c9c 100755
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -68,7 +68,7 @@ cat >$CONFFILE<<EOF
pid directory = $PIDDIR
ncalrpc dir = $NCALRPCDIR
lock dir = $LOCKDIR
- js include = $LIBDIR/js
+ js include = $SRCDIR/scripting/libjs
name resolve order = bcast
interfaces = lo*
diff --git a/source4/script/tests/test_ejs.sh b/source4/script/tests/test_ejs.sh
index 3e2a2a7884..25d1405119 100755
--- a/source4/script/tests/test_ejs.sh
+++ b/source4/script/tests/test_ejs.sh
@@ -21,6 +21,6 @@ PATH=bin:$PATH
export PATH
for f in samr.js echo.js; do
- testit "$f" $SCRIPTDIR/$f ncacn_np:$SERVER -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
+ testit "$f" $SCRIPTDIR/$f $CONFIGURATION ncacn_np:$SERVER -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
done