Log Message:
-----------
Use shell script to generate dropnode slonik so that it can
use the shell variables rather than being hardcoded.

Modified Files:
--------------
    slony1-engine/tests/test2:
        generate_dml.sh (r1.1 -> r1.2)

Added Files:
-----------
    slony1-engine/tests/test2:
        init_dropnode.sh (r1.1)

Removed Files:
-------------
    slony1-engine/tests/test2:
        init_dropnode.ik

-------------- next part --------------
--- tests/test2/init_dropnode.ik
+++ /dev/null
@@ -1,5 +0,0 @@
-CLUSTER NAME = slony_regress1;
-NODE 1 ADMIN CONNINFO = 'dbname=slonyregress1 host=localhost user=pgsql';
-NODE 3 ADMIN CONNINFO = 'dbname=slonyregress3 host=localhost user=pgsql';
-drop node (id = 2);
-
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/test2/generate_dml.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/test2/generate_dml.sh -Ltests/test2/generate_dml.sh -u -w -r1.1 -r1.2
--- tests/test2/generate_dml.sh
+++ tests/test2/generate_dml.sh
@@ -93,7 +93,7 @@
       warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
     fi
     status "loading remaining rows of data"
-    cat ${testname}/init_dropnode.ik > $mktmp/slonik.script
+    ${testname}/init_dropnode.sh > $mktmp/slonik.script
     do_ik
     $pgbindir/psql -h $host $db $user < $mktmp/generate.data.ac 1>> $mktmp/initdata.log 2> $mktmp/initdata.log
     if [ $? -ne 0 ]; then
--- /dev/null
+++ tests/test2/init_dropnode.sh
@@ -0,0 +1,8 @@
+echo <<EOF
+CLUSTER NAME = $CLUSTER1
+NODE 1 ADMIN CONNINFO = 'dbname=$DB1 host=$HOST1 user=$USER1 ';
+NODE 3 ADMIN CONNINFO = 'dbname=$DB3 host=$HOST3 user=$USER3 ';
+drop node (id = 2);
+EOF
+
+