Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Print file content only if diff fails #247

Merged
merged 2 commits into from
Nov 2, 2023
+1 −5
Merged

Print file content only if diff fails #247

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e67620
Print file content only if diff fails
mernst Oct 30, 2023
08c6312
Merge ../AST-Merging-Evaluation-branch-main into diff-show-files
mernst Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,9 @@ small-test:
${MAKE} small-test-diff

small-test-diff:
@echo
@echo "Here is the file content, in case a diff fails."
more results-small/*.csv results-small/merges/*.csv results-small/merges_compared/*.csv results-small/merges_tested/*.csv | cat
@echo
python3 test/check_equal_csv.py --actual_folder results-small/ --goal_folder test/small-goal-files/
@echo
diff -x table_run_time.tex -r -U3 test/small-goal-files/tables/all test/small-goal-files/tables/all
diff -x table_run_time.tex -r -U3 test/small-goal-files/tables/all test/small-goal-files/tables/all || (echo && echo "Here is the file content, for which diff failed." && more results-small/*.csv results-small/merges/*.csv results-small/merges_compared/*.csv results-small/merges_tested/*.csv | cat && echo && diff -x table_run_time.tex -r -U3 test/small-goal-files/tables/all test/small-goal-files/tables/all)

gradle-assemble:
./gradlew -q assemble -g ../.gradle/
Expand Down