Fix util tests

JCSDA · Mar 8, 2024 · 2ae50c5 · 2ae50c5
1 parent db9ae43
commit 2ae50c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/util-tests.yaml b/.github/workflows/util-tests.yaml
@@ -14,10 +14,11 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
         with:
-          submodules: false
+          submodules: true
 
       - name: run-util-tests
         run: |
           export SPACK_STACK_DIR=$PWD
+          source ./setup.sh
           cd util/
           ./util_tests.sh
diff --git a/util/check_package_config.py b/util/check_package_config.py
@@ -21,9 +21,6 @@
 
 SPACK_ROOT = os.getenv("SPACK_ROOT")
 assert SPACK_ROOT, "$SPACK_ROOT must be set but is not!"
-print(SPACK_ROOT)
-print(os.listdir(SPACK_ROOT))
-print(os.listdir(os.path.join(SPACK_ROOT, "lib/spack/external/_vendoring")))
 
 sys.path.append(os.path.join(SPACK_ROOT, "lib/spack/external/_vendoring"))
 from ruamel import yaml

diff --git a/util/util_tests.sh b/util/util_tests.sh
@@ -80,7 +80,10 @@ fi
 
 ## Check check_package_config.py
 export SPACK_ENV=${SPACK_STACK_DIR}/util/test_env
-export SPACK_ROOT=${SPACK_STACK_DIR}/spack
+### NOT NEEDED I THINK export SPACK_ROOT=${SPACK_STACK_DIR}/spack
+${SPACK_STACK_DIR}/util/check_package_config.py
+${SPACK_STACK_DIR}/util/check_package_config.py | sort
+${SPACK_STACK_DIR}/util/check_package_config.py | sort | md5sum
 output_checksum=$(${SPACK_STACK_DIR}/util/check_package_config.py | sort | md5sum)
 reference_checksum=$(cat ${SPACK_STACK_DIR}/util/test_env/package_check_baseline.txt | md5sum)
 if [[ "$output_checksum" != "$reference_checksum" ]]; then