From a70833060c4a86d7e49685a9a7a0d6b2bc976ff8 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 28 Mar 2014 18:57:46 +0000 Subject: [PATCH] Allow using :scriptdir variable in regress tests Have legacy.sql use it to find legacy.sql. The run_test.pl script sets it using pg_config when --extensions switch is given. git-svn-id: http://svn.osgeo.org/postgis/trunk@12375 b70326c6-7e19-0410-871a-916f4a2858ee --- regress/legacy.sql | 2 +- regress/run_test.pl | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/regress/legacy.sql b/regress/legacy.sql index 88899da04..eac6c4c61 100644 --- a/regress/legacy.sql +++ b/regress/legacy.sql @@ -8,7 +8,7 @@ SET client_min_messages TO WARNING; -\i 00-regress-install/share/contrib/postgis/legacy.sql +\i :scriptdir/legacy.sql INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (4326,'EPSG',4326,'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]','+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs '); diff --git a/regress/run_test.pl b/regress/run_test.pl index 2f0c1a778..81879a0c8 100755 --- a/regress/run_test.pl +++ b/regress/run_test.pl @@ -584,7 +584,21 @@ sub run_simple_test mkpath($betmpdir); chmod 0777, $betmpdir; - my $cmd = "psql -v \"VERBOSITY=terse\" -v \"tmpfile='$tmpfile'\" -tXA $DB < $sql > $outfile 2>&1"; + my $scriptdir; + if ( $OPT_EXTENSIONS ) { + # TODO: allow override this default with env variable ? + my $pgis_majmin = $libver; + $pgis_majmin =~ s/^([1-9]*\.[1-9]*).*/\1/; + $scriptdir = `pg_config --sharedir`; + chop $scriptdir; + $scriptdir .= "/contrib/postgis-" . $pgis_majmin; + } else { + $scriptdir = $STAGED_SCRIPTS_DIR; + } + my $cmd = "psql -v \"VERBOSITY=terse\"" + . " -v \"tmpfile='$tmpfile'\"" + . " -v \"scriptdir=$scriptdir\"" + . " -tXA $DB < $sql > $outfile 2>&1"; my $rv = system($cmd); # Check for ERROR lines -- 2.50.1