[Osdldbt-svn] SF.net SVN: osdldbt: [1480] trunk/dbt2

[<ma...@us...>]

Revision: 1480
          http://svn.sourceforge.net/osdldbt/?rev=1480&view=rev
Author:   markwkm
Date:     2006-09-29 09:51:18 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Updated to get the PostgreSQL version using pg_config instead of
'psql --version'.

Modified Paths:
--------------
    trunk/dbt2/configure.ac
    trunk/dbt2/scripts/run_workload.sh.in

Modified: trunk/dbt2/configure.ac
===================================================================
--- trunk/dbt2/configure.ac	2006-09-29 03:10:52 UTC (rev 1479)
+++ trunk/dbt2/configure.ac	2006-09-29 16:51:18 UTC (rev 1480)
@@ -294,6 +294,7 @@
     else
         AC_PATH_PROGS(PG_CONFIG, pg_config, no, "$pgsql_path/bin")
     fi
+    AC_SUBST(PG_CONFIG)
 
     if test -z "$PG_CONFIG" || test ! -r "$PG_CONFIG"; then
         AC_MSG_ERROR([

Modified: trunk/dbt2/scripts/run_workload.sh.in
===================================================================
--- trunk/dbt2/scripts/run_workload.sh.in	2006-09-29 03:10:52 UTC (rev 1479)
+++ trunk/dbt2/scripts/run_workload.sh.in	2006-09-29 16:51:18 UTC (rev 1480)
@@ -116,8 +116,9 @@
 
 # Determine the output directory for storing data.
 RUN_NUMBER=-1
-if test -f run_number; then
-  read RUN_NUMBER < run_number
+RUN_FILE="${abs_top_srcdir}/scripts/run_number"
+if test -f ${RUN_FILE}; then
+  read RUN_NUMBER < ${RUN_FILE}
 fi
 if [ $RUN_NUMBER -eq -1 ]; then
 	RUN_NUMBER=0
@@ -138,7 +139,7 @@
 
 # Update the run number for the next test.
 RUN_NUMBER=`expr $RUN_NUMBER + 1`
-echo $RUN_NUMBER > run_number
+echo $RUN_NUMBER > ${RUN_FILE}
 
 # Create a readme file in the output directory and date it.
 date >> $OUTPUT_DIR/readme.txt


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.