fix workflow/Makefile ordering bug

dweber2022 · Jul 29, 2024 · cf78746 · cf78746
1 parent 2aaae80
commit cf78746
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,9 +22,11 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install colordiff 
-      - name: Build Project and Run All Tests
+      - name: Build Project and Run Tests
         run: |
           mkdir Output
+          make test
+      - name: Run Integration Tests
           python set_paths.py
           pip install .
-          make test
+          make pytest
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all backup test diff ob_changes.patch init debug eclipse web init-web github-web html one exe btc
+.PHONY: all backup test pytest diff ob_changes.patch init debug eclipse web init-web github-web html one exe btc
 
 mofid-dir := $(shell pwd)
 python-packages-dir := $(shell find /usr/lib/python* -type d -iname "site-packages")
@@ -59,7 +59,9 @@ test:
 	make -j$$(nproc); \
 	ctest --output-on-failure --test-dir test; \
 	cd $(mofid-dir); \
-	tests/check_intermediate.sh; \
+	tests/check_intermediate.sh; 
+
+pytest:
 	python tests/check_run_mofid.py; \
 	python tests/check_mof_composition.py