diff options
Diffstat (limited to 'testsuite/run_tests')
-rwxr-xr-x | testsuite/run_tests | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/testsuite/run_tests b/testsuite/run_tests index 57364b3..38d6562 100755 --- a/testsuite/run_tests +++ b/testsuite/run_tests @@ -32,15 +32,11 @@ Comfignat_overriding_absolute_objdir= Comfignat_overriding_absolute_stagedir= # variables that the testcases need: -export library # absolute pathname of function library 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 -# function library for the testcases: -library="${outer_srcdir}"/testsuite/library - # Clean out any old test results. rm -Rf "${outer_builddir}"/testruns @@ -48,7 +44,7 @@ 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 - # Compose the name of the combined test case. + # Compose the name of the combined testcase. test_name=$(basename "${source_directory}")+$(basename "${location_file}")+$(basename "${input_script}") testrundir="${outer_builddir}"/testruns/"${test_name}" file_list="${testrundir}"/files.expected @@ -67,8 +63,10 @@ for source_directory in "${outer_srcdir}"/testsuite/sources/* ; do cp -p "${outer_srcdir}"/comfignat.* "${srcdir}" find "${srcdir}" >>files.expected - # Run the test. - if sh -e "${input_script}" >output 2>&1 ; then + # 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 # Check that the expected files and no others are present. LC_COLLATE=C sort -o files.expected files.expected |