Index: trunk/ippToPsps/test/fulltest.sh
===================================================================
--- trunk/ippToPsps/test/fulltest.sh	(revision 38959)
+++ trunk/ippToPsps/test/fulltest.sh	(revision 38963)
@@ -1,3 +1,6 @@
 #!/bin/csh -f
+
+set dbuser = czw
+set dbpass = -pczw
 
 chmod +x mkgpc1data.dvo mkgpc1.sh
@@ -190,6 +193,6 @@
   # does the database already exist?
   # XXX this command will blow away an existing database!!
-  mysql -h localhost -u dvo -pdvo -e "create database if not exists ipptopsps_test" || exit 3
-  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3
+  mysql -h localhost -u $dbuser $dbpass -e "create database if not exists ipptopsps_test" || exit 3
+  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3
   echo " ---- init ipptopsps_test: done ----"
 endif
@@ -201,6 +204,6 @@
 
   # create the database (ignore failure if it already exists)
-  mysql -h localhost -u dvo -pdvo -e "drop database if exists ipptopsps_test_scratch"
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
+  mysql -h localhost -u $dbuser $dbpass -e "drop database if exists ipptopsps_test_scratch"
+  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch"
   ippjython setupScratchDb.py -test < /dev/null
   if ($status) exit
Index: trunk/ippToPsps/test/mkgpc1.sh
===================================================================
--- trunk/ippToPsps/test/mkgpc1.sh	(revision 38959)
+++ trunk/ippToPsps/test/mkgpc1.sh	(revision 38963)
@@ -59,6 +59,9 @@
   echo ntable: $ntable
   if ($ntable != 25) then
-    echo "expected 25 lines (24 tables), but got $ntable, not deleting"
-    exit 2
+    if ($ntable != 21) then
+	echo "expected 25 lines (24 tables), but got $ntable, not deleting"
+	exit 2
+    endif
+    echo "Found old style 21 line (20 table) version of the database, so not blocking deletion."
   endif
 
Index: trunk/ippToPsps/test/mkgpc1data.dvo
===================================================================
--- trunk/ippToPsps/test/mkgpc1data.dvo	(revision 38959)
+++ trunk/ippToPsps/test/mkgpc1data.dvo	(revision 38963)
@@ -3,5 +3,6 @@
 input tap.dvo
 
-if (not($?VERBOSE)) set VERBOSE = 0
+opihi verbose on
+if (not($?VERBOSE)) set VERBOSE = 1
 if (not($?PARALLEL)) set PARALLEL = 0
 
@@ -70,6 +71,6 @@
   $dbhost = localhost
   $dbname = gpc1test
-  $dbuser = dvo
-  $dbpass = dvo
+  $dbuser = czw
+  $dbpass = czw
 
   $RA = 10.0
Index: trunk/ippToPsps/test/partest.sh
===================================================================
--- trunk/ippToPsps/test/partest.sh	(revision 38959)
+++ trunk/ippToPsps/test/partest.sh	(revision 38963)
@@ -1,3 +1,6 @@
 #!/bin/csh -f
+
+set dbuser = czw
+set dbpass = -pczw
 
 set stackqueuename = 0
@@ -49,6 +52,6 @@
   # does the database already exist?
   # XXX this command will blow away an existing database!!
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
-  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
+  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test"
+  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
 
 endif
@@ -88,11 +91,11 @@
 
   # create the database (ignore failure if it already exists)
-  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch1"
-  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch2"
-  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch3"
-
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch1"
-  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch2"
-  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3"
+  mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_test_scratch1"
+  # mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_scratch2"
+  # mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_scratch3"
+
+  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch1"
+  # mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_scratch2"
+  # mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_scratch3"
 
   ippjython setupScratchDb.py -test dummy ipptopsps_test_scratch1
Index: trunk/ippToPsps/test/sastest.sh
===================================================================
--- trunk/ippToPsps/test/sastest.sh	(revision 38959)
+++ trunk/ippToPsps/test/sastest.sh	(revision 38963)
@@ -1,3 +1,6 @@
 #!/bin/csh -f
+
+set dbuser = czw
+set dbpass = -pczw
 
 chmod +x mksasdata.dvo mkgpc1.sh
@@ -157,6 +160,6 @@
   # does the database already exist?
   # XXX this command will blow away an existing database!!
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
-  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
+  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test"
+  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
 endif
 
@@ -165,6 +168,6 @@
 
   # create the database (ignore failure if it already exists)
-  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch"
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch"
+  mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_scratch"
+  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_scratch"
   ippjython setupScratchDb.py -test < /dev/null
   if ($status) exit
Index: trunk/ippToPsps/test/widetest.sh
===================================================================
--- trunk/ippToPsps/test/widetest.sh	(revision 38959)
+++ trunk/ippToPsps/test/widetest.sh	(revision 38963)
@@ -1,3 +1,6 @@
 #!/bin/csh -f
+
+set dbuser = czw
+set dbpass = -pczw
 
 set stackqueuename = 0
@@ -48,6 +51,6 @@
   # does the database already exist?
   # XXX this command will blow away an existing database!!
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
-  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
+  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test"
+  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
 
 endif
@@ -57,6 +60,6 @@
 
   # create the database (ignore failure if it already exists)
-  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch"
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
+  mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_test_scratch"
+  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch"
   ippjython setupScratchDb.py -test
 endif