Change results-small to results/small (benedikt-schesch#274)

cactusbranch01 · Apr 28, 2024 · b56537d · b56537d
1 parent b1afb3d
commit b56537d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,7 +35,6 @@ cache-machines/
 test/tmp1.txt
 test/tmp2.txt
 test/small-goal-files/result-without-times.txt
-results-small/result-without-times.txt
 
 # Compiled class file
 *.class

diff --git a/README.md b/README.md
@@ -65,17 +65,17 @@ make small-test
 ```
 
 This runs the entire code on two small repos.
-The output data appears in `results-small/`.
+The output data appears in `results/small/`.
 
-* `results-small/result.csv`: the final result
+* `results/small/result.csv`: the final result
 
-* `results-small/merges/` contains all the merges.
+* `results/small/merges/` contains all the merges.
 
-* `results-small/merges_compared/` contains all merges and indicates whether the merge results are different and thus need to be analyzed.
+* `results/small/merges_compared/` contains all merges and indicates whether the merge results are different and thus need to be analyzed.
 
-* `results-small/merges_tested/` contains all merges that have been tested.
+* `results/small/merges_tested/` contains all merges that have been tested.
 
-* `results-small/result.csv` contains the final result.
+* `results/small/result.csv` contains the final result.
 
 ### Perform full analysis
 
@@ -207,6 +207,6 @@ To run style checking run `make style`.
 
 * results/ -> Contains all the results for the full analysis.
 
-* results-small/ -> Contains all the results for the small analysis.
+* results/small/ -> Contains all the results for the small analysis.
 
 * jars/ -> Location for the IntelliMerge and Spork jars.
diff --git a/test/check_equal_csv.py b/test/check_equal_csv.py
@@ -21,7 +21,7 @@ def remove_run_time(df):
         "--actual_folder",
         type=str,
         help="Path to actual folder",
-        default="results-small",
+        default="results/small",
     )
     parser.add_argument(
         "--goal_folder",