Rombobjörn

summaryrefslogtreecommitdiff
path: root/testsuite/library
diff options
context:
space:
mode:
authorBjörn Persson <Bjorn@Rombobjörn.se>2014-02-01 09:58:52 +0100
committerBjörn Persson <Bjorn@Rombobjörn.se>2014-02-01 09:58:52 +0100
commitaedfc53e9a783b8cc1091f5a6d6bb15317616646 (patch)
treec7e37479f82b909e38b5c5b45db6e8a54033a4d9 /testsuite/library
parent5d900ea8ccb660d4d3bb9aaa08464fb9aae081f9 (diff)
more testcases
Diffstat (limited to 'testsuite/library')
-rw-r--r--testsuite/library40
1 files changed, 20 insertions, 20 deletions
diff --git a/testsuite/library b/testsuite/library
index c665c71..4482215 100644
--- a/testsuite/library
+++ b/testsuite/library
@@ -11,26 +11,6 @@
# modified is included with the above copyright notice.
-# These directory variables mustn't be conveyed from Comfignat, because then
-# the testsuite would rely on the same thing that it's supposed to test.
-prefix=/usr/local
-exec_prefix=${prefix}
-datarootdir=${prefix}/share
-bindir=${exec_prefix}/bin
-libexecdir=${exec_prefix}/libexec
-includedir=${prefix}/include
-libdir=${exec_prefix}/lib
-alidir=${libdir}
-gprdir=${datarootdir}/gpr
-stagedir=stage
-stage_bindir=${stagedir}${bindir}
-stage_libexecdir=${stagedir}${libexecdir}
-stage_includedir=${stagedir}${includedir}
-stage_libdir=${stagedir}${libdir}
-stage_alidir=${stagedir}${alidir}
-stage_gprdir=${stagedir}${gprdir}
-
-
expect_configuration () {
# If "always" is passed, the testcase is always expected to leave a
# configuration file. If this is called without "always", a configuration
@@ -45,6 +25,26 @@ expect_generated_files () {
# The testcase is expected to generate files which are listed in the file
# generated_files. The list is whitespace-separated and may contain shell
# variable references.
+
+ # These directory variables mustn't be conveyed from Comfignat, because then
+ # the testsuite would rely on the same thing that it's supposed to test.
+ prefix=${prefix:-/usr/local}
+ exec_prefix=${exec_prefix:-${prefix}}
+ datarootdir=${datarootdir:-${prefix}/share}
+ bindir=${bindir:-${exec_prefix}/bin}
+ libexecdir=${libexecdir:-${exec_prefix}/libexec}
+ includedir=${includedir:-${prefix}/include}
+ libdir=${libdir:-${exec_prefix}/lib}
+ alidir=${alidir:-${libdir}}
+ gprdir=${gprdir:-${datarootdir}/gpr}
+ stagedir=stage
+ stage_bindir=${stagedir}${bindir}
+ stage_libexecdir=${stagedir}${libexecdir}
+ stage_includedir=${stagedir}${includedir}
+ stage_libdir=${stagedir}${libdir}
+ stage_alidir=${stagedir}${alidir}
+ stage_gprdir=${stagedir}${gprdir}
+
for file in $(cat "${srcdir}"/generated_files) ; do
# Expand variables in the string to get the pathname.
eval file="${file}"