fix(unit-test): update to use new folder structure

discopop-project · Oct 18, 2023 · 4e87750 · 4e87750
1 parent d0583a4
commit 4e87750
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/test/do_all/daxpy/src/Makefile b/test/do_all/daxpy/src/Makefile
@@ -1,12 +1,14 @@
 all: clean prog
 
 prog: daxpy.o
-	$(LINKER) -o prog daxpy.o $(CXXFLAGS)
+	$(CXX) -o prog daxpy.o $(CXXFLAGS)
 
 daxpy.o:
 	$(CXX) -c -o daxpy.o daxpy.cpp $(CXXFLAGS)
 
 clean:
+	rm -rf .discopop
+	rm -rf src/.discopop
 	find . -not -name daxpy.cpp -not -name Makefile -not -path **/FileMapping.txt -delete
 
 veryclean: clean

diff --git a/test/do_all/daxpy/test.py b/test/do_all/daxpy/test.py
@@ -21,16 +21,19 @@ def test(self):
         os.system("" + os.path.join(build_dir, "scripts", "dp-fmap"))
 
         # build
-        make_command = "DP_FM_PATH=" + os.path.join(src_dir, "FileMapping.txt") + " "
+        # make_command = "DP_FM_PATH=" + os.path.join(src_dir, "FileMapping.txt") + " "
+        make_command = ""
         make_command += "CC=" + os.path.join(build_dir, "scripts", "CC_wrapper.sh") + " "
         make_command += "CXX=" + os.path.join(build_dir, "scripts", "CXX_wrapper.sh") + " "
-        make_command += "LINKER=" + os.path.join(build_dir, "scripts", "LINKER_wrapper.sh") + " "
+        # make_command += "LINKER=" + os.path.join(build_dir, "scripts", "LINKER_wrapper.sh") + " "
         make_command += "make "
         os.system(make_command)
         # execute instrumented program
         os.system("./prog")
         # execute DiscoPoP analysis
-        os.system("discopop_explorer --dep-file=prog_dep.txt --dump-detection-result")
+        os.chdir(".discopop")
+        os.system("discopop_explorer")
+        os.chdir("..")
         # validate results
         self.validate_results(current_dir, src_dir)
         # clean environment
@@ -39,7 +42,7 @@ def test(self):
     def validate_results(self, test_dir, src_dir):
         """compare results to gold standard"""
         gold_standard_file = os.path.join(test_dir, "detection_result_dump.json")
-        test_output_file = os.path.join(src_dir, "detection_result_dump.json")
+        test_output_file = os.path.join(src_dir, ".discopop", "explorer", "detection_result_dump.json")
         # load both detection results
         with open(gold_standard_file, "r") as f:
             tmp_str = f.read()