r17547: Add test by mkhl for some of our variable substituion behaviour.

Andrew Bartlett

diff --git a/source/script/tests/test_ejs.sh b/source/script/tests/test_ejs.sh
index aabefcf233be829ca9f6dbeb58c83323659ccf2f..3ad3ed2781f1591911e9ddf20cf74822c3941ba2 100755 (executable)
--- a/source/script/tests/test_ejs.sh
+++ b/source/script/tests/test_ejs.sh
@@ -21,6 +21,8 @@ DATADIR=../testdata
 PATH=bin:$PATH
 export PATH
 
+testit "base.js" $SCRIPTDIR/base.js || failed=`expr $failed + 1`
+
 for f in samr.js echo.js; do
     testit "$f" $SCRIPTDIR/$f $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
 done

diff --git a/testprogs/ejs/base.js b/testprogs/ejs/base.js
new file mode 100755 (executable)
index 0000000..fddf642
--- /dev/null
+++ b/testprogs/ejs/base.js
@@ -0,0 +1,15 @@
+#!/bin/sh
+exec smbscript "$0" ${1+"$@"}
+libinclude("base.js");
+
+var obj = new Object();
+obj.FOO = "foo";
+obj.BAR = "bar";
+var str1 = "${FOO}:${BAR}";
+var str2 = "${FOO}:${BAR} "; // note the space after the brace
+var sub1 = substitute_var(str1, obj);
+var sub2 = substitute_var(str2, obj);
+
+assert(str1 + " " == str2);
+assert(sub1 + " " == sub2);
+exit(0);