From 97bc17010f2f4fabd86f280aabb1a0a011459f11 Mon Sep 17 00:00:00 2001
From: PhilKoe <Philipp.Koester@hs-esslingen.de>
Date: Tue, 23 Jan 2024 11:42:52 +0100
Subject: [PATCH] fix test script in wrong directory

---
 ...AM_VirgilioRe22Pr7_Perfomance_all_posix.sh |  3 ++
 ...gilioRe22Pr7_Perfomance_1_worker_all_posix | 45 -------------------
 2 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 libiotrace/scripts/testscripts/tests/test_openFOAM_VirgilioRe22Pr7_Perfomance_1_worker_all_posix

diff --git a/libiotrace/scripts/testscripts/tests/openFOAM_VirgilioRe22Pr7_Perfomance_all_posix.sh b/libiotrace/scripts/testscripts/tests/openFOAM_VirgilioRe22Pr7_Perfomance_all_posix.sh
index fbd1b36..deecb67 100755
--- a/libiotrace/scripts/testscripts/tests/openFOAM_VirgilioRe22Pr7_Perfomance_all_posix.sh
+++ b/libiotrace/scripts/testscripts/tests/openFOAM_VirgilioRe22Pr7_Perfomance_all_posix.sh
@@ -70,6 +70,7 @@ sed -i -r "s:^SimuEnd\t\t100;:SimuEnd         ${test_end_time};:" "${3}/${2}/sys
 # define libiotrace and necessary environment variables for use with and without mpirun
 LIBIOTRACE_WITH_ENV="IOTRACE_LOG_NAME=$IOTRACE_LOG_NAME IOTRACE_DATABASE_IP=$IOTRACE_DATABASE_IP IOTRACE_DATABASE_PORT=$IOTRACE_INFLUX_PORT IOTRACE_INFLUX_ORGANIZATION=$IOTRACE_INFLUX_ORGANIZATION IOTRACE_INFLUX_BUCKET=$IOTRACE_INFLUX_BUCKET IOTRACE_INFLUX_TOKEN=$IOTRACE_INFLUX_TOKEN LD_PRELOAD=$IOTRACE_LD_PRELOAD"
 MPI_LIBIOTRACE_WITH_ENV="-x "${LIBIOTRACE_WITH_ENV// / -x }
+MPI_LIBIOTRACE_WITH_ENV_STRACE="-E "${LIBIOTRACE_WITH_ENV// / -E }
 
 # start test
 echo "    start test"
@@ -81,3 +82,5 @@ echo "        running buoyantPimpleFoam"
 #cd ${3}/${2}/ && mpirun -N ${6} -H ${4} -np ${PROCESS_COUNT} ${MPI_LIBIOTRACE_WITH_ENV} buoyantFoam < /dev/null > log.buoyantFoam 2>&1
 echo "            cd ${3}/${2}/ && mpirun -H ${4} -np ${PROCESS_COUNT} ${MPI_LIBIOTRACE_WITH_ENV} buoyantPimpleFoam -parallel < /dev/null > log.buoyantPimpleFoam 2>&1"
 cd ${3}/${2}/ && mpirun -N ${6} -H ${4} -np ${PROCESS_COUNT} ${MPI_LIBIOTRACE_WITH_ENV} buoyantPimpleFoam -parallel < /dev/null > log.buoyantPimpleFoam 2>&1
+#cd ${3}/${2}/ && mpirun -N ${6} -H ${4} -np ${PROCESS_COUNT} strace --follow-forks -o "strace_$(hostname)" ${MPI_LIBIOTRACE_WITH_ENV_STRACE} buoyantPimpleFoam -parallel < /dev/null > log.buoyantPimpleFoam 2>&1
+#cd ${3}/${2}/ && valgrind --tool=callgrind --dump-instr=yes --collect-jumps=yes --trace-children=yes mpirun -N ${6} -H ${4} -np ${PROCESS_COUNT} ${MPI_LIBIOTRACE_WITH_ENV} buoyantPimpleFoam -parallel < /dev/null > log.buoyantPimpleFoam 2>&1
diff --git a/libiotrace/scripts/testscripts/tests/test_openFOAM_VirgilioRe22Pr7_Perfomance_1_worker_all_posix b/libiotrace/scripts/testscripts/tests/test_openFOAM_VirgilioRe22Pr7_Perfomance_1_worker_all_posix
deleted file mode 100644
index d096238..0000000
--- a/libiotrace/scripts/testscripts/tests/test_openFOAM_VirgilioRe22Pr7_Perfomance_1_worker_all_posix
+++ /dev/null
@@ -1,45 +0,0 @@
-# dependencies
-test_source_configs=("influxdb" "gcc_mpi" "openfoam_com_2106")
-test_source=("${test_openfoam_dir}/etc/bashrc")
-test_modules=("compiler/gnu/${test_gcc_version}" "mpi/openmpi/${test_mpi_version}")
-test_file_url=("https://bwsyncandshare.kit.edu/s/MQfkypzfHfmZZtM/download VirgilioRe22Pr7_Perfomance.zip")
-test_unzip_files=("VirgilioRe22Pr7_Perfomance.zip")
-
-# libiotrace
-test_libiotrace_cmake_options=(
--DALL_WRAPPERS_ACTIVE=ON
--DENABLE_FILESYSTEM_METADATA=OFF
--DENABLE_OUTPUT=INFLUXDB
--DENABLE_REMOTE_CONTROL=OFF
--DFILENAME_RESOLUTION_ENABLED=OFF
--DLOGGING=OFF
--DLOG_WRAPPER_TIME=OFF
--DREALTIME=ON
--DSENDING=ON
--DWITH_ALLOC=OFF
--DWITH_DL_IO=OFF
--DWITH_MPI_IO=OFF
--DWITH_POSIX_AIO=OFF
--DWITH_POSIX_IO=ON
--DWITH_STD_IO=OFF
-)
-
-# slurm
-test_nodes=2
-test_processes_per_worker=64
-export test_processes_per_influxdb=60
-test_mem="249600mb"
-test_time="00:30:00"
-test_queue_name="dev_multiple_il"
-
-# test script
-test_script="./openFOAM_VirgilioRe22Pr7_Perfomance_all_posix.sh"
-export test_source_dir="${PWD}/VirgilioRe22Pr7_Perfomance"
-export test_source_1="${test_source_dir}/1"
-export test_source_constant="${test_source_dir}/constant"
-export test_source_system="${test_source_dir}/system"
-export test_end_time=1.001
-
-# output
-test_name="3_nodes_VirgilioRe22Pr7_Perfomance"
-export IOTRACE_LOG_NAME=openFOAM_VirgilioRe22Pr7_Perfomance_test1