Port MUSIC tests from SLI to Python

testsuite/CMakeLists.txt

@@ -23,7 +23,7 @@ set( TESTSUBDIRS
     regressiontests
     mpitests
     mpi_selftests
-    musictests
+    sli2py_music
     cpptests
     pytests
 )
@@ -36,11 +36,12 @@ add_subdirectory( regressiontests/sli2py_ignore )
 add_subdirectory( mpi_selftests/fail )
 add_subdirectory( mpi_selftests/pass )
 add_subdirectory( mpitests )
-add_subdirectory( musictests )
+add_subdirectory( sli2py_music )
 add_subdirectory( cpptests )
 
 install( DIRECTORY ${TESTSUBDIRS}
     DESTINATION ${CMAKE_INSTALL_DATADIR}/testsuite
+    USE_SOURCE_PERMISSIONS
 )
 
 install( PROGRAMS

testsuite/SLI2PY_TODO.md

@@ -2,7 +2,6 @@ To port
 - unittests
 - regressiontests
 - mpitests
-- musictests
 
 Ignore
 - selftests

testsuite/do_tests.sh

@@ -422,16 +422,16 @@ if test "${MUSIC}"; then
     BASEDIR="$PWD"
     TMPDIR_MUSIC="$(mktemp -d)"
 
-    TESTDIR="${TEST_BASEDIR}/musictests/"
+    TESTDIR="${TEST_BASEDIR}/sli2py_music/"
 
     # shellcheck disable=SC2044
     for test_name in $(find "${TESTDIR}" -maxdepth 1 -name '*.music' -printf '%f\n'); do
         music_file="${TESTDIR}/${test_name}"
 
-        # Collect the list of SLI files from the '.music' file.
-        sli_files="$(grep '\.sli' "${music_file}" | sed -e "s#args=#${TESTDIR}#g")"
-        sli_files="$(for f in ${sli_files}; do if test -f "${f}"; then echo "${f}"; fi; done)"
-        sli_files="${sli_files//$'\n'/ }"
+        # Collect the list of Python files from the '.music' file.
+        py_files="$(grep '\.py' "${music_file}" | sed -e "s#binary=#${TESTDIR}#g")"
+        py_files="$(for f in ${py_files}; do if test -f "${f}"; then echo "${f}"; fi; done)"
+        py_files="${py_files//$'\n'/ }"
 
         # Check if there is an accompanying shell script for the test.
         sh_file="${TESTDIR}/$(basename "${music_file}" ".music").sh"
@@ -443,24 +443,24 @@ if test "${MUSIC}"; then
 
         # Calculate the total number of processes from the '.music' file.
         np="$(($(sed -n 's/np=//p' "${music_file}" | paste -sd'+' -)))"
-        test_command="$(sli -c "${np} (${MUSIC}) (${test_name}) mpirun =only")"
+        test_command="${MPI_LAUNCHER} ${SLI_MPIEXEC_PREFLAGS} -np ${np} ${MUSIC} ${test_name}"
 
         proc_txt="processes"
         if test $np -eq 1; then proc_txt="process"; fi
         echo          "Running test '${test_name}' with $np $proc_txt... " >> "${TEST_LOGFILE}"
         printf '%s' "  Running test '${test_name}' with $np $proc_txt... "
 
         # Copy everything to TMPDIR_MUSIC.
-        # Note that variables might also be empty, so test for file existance first.
-	# Note that ${sli_files} must not be quoted because it expands into multiple, space-separate file names.
-        for filename in "${music_file}" "${sh_file}" "${input_file}" ${sli_files}; do
+        # Note that variables might also be empty, so test for file existence first.
+        # Note that ${py_files} must not be quoted because it expands into multiple, space-separate file names.
+        for filename in "${music_file}" "${sh_file}" "${input_file}" ${py_files}; do
             test -e "${filename}" && cp "${filename}" "${TMPDIR_MUSIC}"
         done
 
         # Create the runner script in TMPDIR_MUSIC.
         cd "${TMPDIR_MUSIC}"
         {
-            echo "#!/bin/sh"
+            echo "#!/usr/bin/env sh"
             echo "set +e"
             echo "NEST_DATA_PATH=\"${TMPDIR_MUSIC}\""
             echo "${test_command} > ${TEST_OUTFILE} 2>&1"