Ticket #33673: libpqxx-test.2.diff

Portfile

@@ -61 +76 @@
 # http://pqxx.org/development/libpqxx/browser/trunk/README?rev=latest
 # http://pqxx.org/development/libpqxx/wiki/TestDocs
 
-test.run        no
+set testdb      test_libpqxx
+set testport    5455
+test.run        yes
 test.cmd        make
 test.target     check
 
+# PGDATABASE    (name of database; defaults to your user name)
+# PGHOST        (database server; defaults to local machine)
+# PGPORT        (PostgreSQL port to connect to; default is 5432)
+# PGUSER        (your PostgreSQL user ID; defaults to your login name)
+# PGPASSWORD    (your PostgreSQL password, if needed)
+test.env        PGDATABASE=${testdb} \
+                PGPORT=${testport}
+                #PGUSER
+                #PGPASSWORD
+
 pre-test {
-    system "initdb -D ${worksrcdir}/test_libpqxx"
-    system "pg_ctl -w -D ${worksrcdir}/test_libpqxx -l ${worksrcdir}/test_libpqxx/logfile -o \"-p 5455\" start"
-    # test for existence of ${worksrcdir}/test_libpqxx/postmaster.pid to indicate success
-
-    # PGDATABASE    (name of database; defaults to your user name)
-    # PGHOST        (database server; defaults to local machine)
-    # PGPORT        (PostgreSQL port to connect to; default is 5432)
-    # PGUSER        (your PostgreSQL user ID; defaults to your login name)
-    # PGPASSWORD    (your PostgreSQL password, if needed)
-    test.env-append \
-        PGDATABASE=${worksrcdir}/test_libpqxx \
-        PGPORT=5455
-        #PGUSER
-        #PGPASSWORD
+    system -W ${worksrcpath} "${prefix}/lib/${server}/bin/initdb -D ${testdb}"
+    # "system" doesn't return for some reason, but exec does
+    if {[catch {exec sudo -u ${macportsuser} ${prefix}/lib/${server}/bin/pg_ctl -w -D ${worksrcpath}/${testdb} -l ${worksrcpath}/${testdb}/logfile -o "-p ${testport}" start} result]} {
+        return -code error "could not start postgresql server: ${result}"
+    }
 }
 
 post-test {
-    system "pg_ctl -w -D ${worksrcdir}/test_libpqxx stop -m fast"
-    system "rm -rf ${worksrcdir}/test_libpqxx"
+    system -W ${worksrcpath} "${prefix}/lib/${server}/bin/pg_ctl -w -D ${testdb} stop -m fast"
 }
-