Merge pull request #5802 from janekmi/pkg-specific-paths-added-somewh…

…ere-else

common: move PKG-specific variables out of the testconfig generating …

utils/docker/configure-tests.sh

@@ -22,19 +22,8 @@ ENABLE_SUDO_TESTS=y
 TM=1
 EOF
 
-if [[ "${1}" == "PKG" ]]; then
- #Append variables exclusively for PKG tests:
- if [ $OS = opensuse/leap ] || [ $OS = rockylinux/rockylinux ]; then
- echo "PMDK_LIB_PATH_NONDEBUG=/usr/lib64" >> $WORKDIR/src/test/testconfig.sh
- echo "PMDK_LIB_PATH_DEBUG=/usr/lib64/pmdk_debug" >> $WORKDIR/src/test/testconfig.sh
- elif [ $OS = ubuntu ]; then
- echo "PMDK_LIB_PATH_NONDEBUG=/lib/x86_64-linux-gnu" >> $WORKDIR/src/test/testconfig.sh
- echo "PMDK_LIB_PATH_DEBUG=/lib/x86_64-linux-gnu/pmdk_dbg" >> $WORKDIR/src/test/testconfig.sh
- fi
-fi
-
 # Configure python tests
- cat << EOF >> $WORKDIR/src/test/testconfig.py
+cat << EOF > $WORKDIR/src/test/testconfig.py
 config = {
  'unittest_log_level': 1,
  'cacheline_fs_dir': '/tmp',

utils/docker/prepare-for-build.sh

@@ -21,5 +21,5 @@ fi
 # should be preserved
 KEEP_TEST_CONFIG=${KEEP_TEST_CONFIG:-0}
 if [[ "$KEEP_TEST_CONFIG" == 0 ]]; then
- ./configure-tests.sh $@
+ ./configure-tests.sh
 fi

utils/docker/run-build-package.sh

@@ -65,7 +65,23 @@ make -j$(nproc)
 
 # Prepare test config once more. Now, with path to PMDK set in the OS
 # (rather than in the git tree) - for testing packages installed in the system.
-$SCRIPTSDIR/configure-tests.sh PKG
+$SCRIPTSDIR/configure-tests.sh
+
+# Append variables exclusively for PKG tests
+case "$OS" in
+"opensuse/leap" | "rockylinux/rockylinux")
+ PMDK_LIB_PATH_NONDEBUG=/usr/lib64
+ ;;
+"ubuntu")
+ PMDK_LIB_PATH_NONDEBUG=/lib/x86_64-linux-gnu
+ ;;
+esac
+
+cat << EOF >> $WORKDIR/src/test/testconfig.sh
+PMDK_LIB_PATH_NONDEBUG=$PMDK_LIB_PATH_NONDEBUG
+PMDK_LIB_PATH_DEBUG=$PMDK_LIB_PATH_NONDEBUG/pmdk_debug
+EOF
+
 ./RUNTESTS.sh -t check
 popd