more testcases

1 files changed, 7 insertions, 4 deletions

diff --git a/testsuite/run_tests b/testsuite/run_tests
index f440f8d..06e9c4c 100755
--- a/testsuite/run_tests
+++ b/testsuite/run_tests
@@ -21,6 +21,8 @@ set -e
 outer_srcdir="$1"
 outer_builddir="$2"
 
+testsuitedir="${outer_srcdir}"/testsuite
+
 # Initialize counters.
 passed=0
 failed=0
@@ -36,6 +38,7 @@ export file_list          # absolute pathname of list of expected files
 export srcdir             # testcase's source directory relative to testrundir
 export builddir           # testcase's build directory relative to testrundir
 export relative_builddir  # testcase's build directory relative to srcdir
+export dirgpr="${testsuitedir}"/test_directories.gpr
 
 
 pass () {
@@ -61,9 +64,9 @@ fail () {
 # Clean out any old test results.
 rm -Rf "${outer_builddir}"/testruns
 
-for source_directory in "${outer_srcdir}"/testsuite/sources/* ; do
-   for location_file in "${outer_srcdir}"/testsuite/locations/* ; do
-      for input_script in "${outer_srcdir}"/testsuite/inputs/* ; do
+for source_directory in "${testsuitedir}"/sources/* ; do
+   for location_file in "${testsuitedir}"/locations/* ; do
+      for input_script in "${testsuitedir}"/inputs/* ; do
 
          # Compose the name of the combined testcase.
          test_name=$(basename "${source_directory}")+$(basename "${location_file}")+$(basename "${input_script}")
@@ -87,7 +90,7 @@ for source_directory in "${outer_srcdir}"/testsuite/sources/* ; do
          # Run the testcase in a child process.
          # The child process first loads the function library and then runs the
          # input script.
-         if sh -e -c ". ${outer_srcdir}/testsuite/library; . ${input_script}" >output 2>&1 ; then
+         if sh -e -c ". ${testsuitedir}/library; . ${input_script}" >output 2>&1 ; then
 
             # Check that the expected files and no others are present.
             # Sort the list of expected files and remove duplicates.