Changeset 170 for trunk/test/testrun_2d.sh

Timestamp:

Apr 30, 2008, 11:56:45 PM (16 years ago)

Author:

katerina

Message:

Plenty of compiler warnings fixed, SQL query length fixed, doc update.

File:

• trunk/test/testrun_2d.sh (modified) (2 diffs)

trunk/test/testrun_2d.sh

@@ -24 +24 @@
 CLIENT_BUILDOPTS="--quiet  $TRUST --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --enable-network=client --disable-mail --disable-external-scripts --enable-login-watch --enable-xml-log --enable-db-reload --with-logserver=localhost --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export CLIENT_BUILDOPTS
 
+create_pgpass () {
+touch ~/.pgpass
+chmod 600 ~/.pgpass
+cat > ~/.pgpass << EOF
+localhost:*:samhain:samhain:samhain
+EOF
+}
+
 check_psql_log () {
     DATE="$1"
 
     rm -f test_log_db
-    PGPASSWORD=samhain; export PGPASSWORD
+    # PGPASSWORD=samhain; export PGPASSWORD
+    create_pgpass
     psql -U samhain -d samhain -c "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '${DATE}';" >test_log_db
     #
@@ -77 +86 @@
         return 1
     else
-        PGPASSWORD="samhain"; export PGPASSWORD
+        # PGPASSWORD="samhain"; export PGPASSWORD
+        create_pgpass
         TEST=`psql -U samhain -d samhain -c "SELECT * FROM log LIMIT 1;" 2>/dev/null`
         if [ $? -ne 0 -o -z "$TEST" ]; then