diff options
| author | Peter Eisentraut | 2000-10-23 21:44:12 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2000-10-23 21:44:12 +0000 |
| commit | 7b021ce17c4abe731a3a4c6cb5e23f13d6fd3f52 (patch) | |
| tree | 6cb59b5918e05e9fc04f1a86931cec3cfbae11aa /src/test/regress | |
| parent | bc083d3d90dd26b755a60c74d561f9dab5897d5c (diff) | |
Polish shared library build to reduce number of special hacks. In
particular, allow linking with arbitrary commands rather than only $(AR) or
$(LD), and treat C++ without hacks.
Add option to disable shared libraries. This takes the place of the
BSD_SHLIB variable. The regression test driver ignores the plpgsql test
if there are no shared libraries available.
Diffstat (limited to 'src/test/regress')
| -rw-r--r-- | src/test/regress/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/test/regress/pg_regress.sh | 13 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 6c26e96cee9..0e79a155187 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.28 2000/10/20 21:04:25 petere Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.29 2000/10/23 21:44:07 petere Exp $ # #------------------------------------------------------------------------- @@ -36,6 +36,7 @@ pg_regress: pg_regress.sh GNUmakefile -e 's/@VERSION@/$(VERSION)/g' \ -e 's/@host_tuple@/$(host_tuple)/g' \ -e 's,@GMAKE@,$(MAKE),g' \ + -e 's/@enable_shared@/$(enable_shared)/g' \ $< >$@ chmod a+x $@ diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index 01cc436afe8..71203bf0d9c 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.8 2000/10/22 22:15:09 petere Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.9 2000/10/23 21:44:12 petere Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -73,6 +73,7 @@ libdir='@libdir@' bindir='@bindir@' datadir='@datadir@' host_platform='@host_tuple@' +enable_shared='@enable_shared@' unset mode unset schedule @@ -406,17 +407,14 @@ fi # Install the PL/pgSQL language in it # ---------- -case $host_platform in - *-*-qnx*) : ;; - *) +if [ "$enable_shared" = yes ]; then message "installing PL/pgSQL" "$bindir/createlang" -L "$libdir" $psql_options plpgsql $dbname if [ $? -ne 0 ] && [ $? -ne 2 ]; then echo "$me: createlang failed" (exit 2); exit fi - ;; -esac +fi # ---------- @@ -436,6 +434,7 @@ cat /dev/null >"$diff_file" lno=0 ( + [ "$enable_shared" != yes ] && echo "ignore: plpgsql" cat $schedule for x in $extra_tests; do echo "test: $x" @@ -472,7 +471,7 @@ do $PSQL -d "$dbname" <"$inputdir/sql/$1.sql" >"$outputdir/results/$1.out" 2>&1 else # Start a parallel group - $ECHO_N "parallel group ($# tests): " $ECHO_C + $ECHO_N "parallel group ($# tests): $ECHO_C" for name do ( $PSQL -d $dbname <"$inputdir/sql/$name.sql" >"$outputdir/results/$name.out" 2>&1 $ECHO_N " $name$ECHO_C" |