Skip to content

Commit 144f824

Browse files
author
james-ball-qualcomm
authored
Merge pull request #84 from riscv/83-improve-passfail-message-of-norm-rule-test-makefile
Clear pass/fail messages in makefile
2 parents ff1e5eb + 55919f3 commit 144f824

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repos:
88
- id: end-of-file-fixer
99
exclude: |
1010
\.svg$|
11-
^schemas/.*\.json$
11+
\.json$
1212
- id: trailing-whitespace
1313
args: [--markdown-linebreak-ext=md]
1414
exclude: \.svg$
@@ -17,4 +17,4 @@ repos:
1717
rev: 0.2.3
1818
hooks:
1919
- id: yamlfmt
20-
args: [--mapping, '2', --sequence, '4', --offset, '2']
20+
args: [--mapping, '2', --sequence, '4', --offset, '2', --preserve-quotes]

Makefile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,12 @@ build-test-norm-rules: $(BUILT_NORM_RULES)
124124
compare-tests: compare-test-tags compare-test-norm-rules
125125

126126
compare-test-tags: $(EXPECTED_NORM_TAGS) $(BUILT_NORM_TAGS)
127-
@echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
128-
@echo Comparing $(EXPECTED_NORM_TAGS) to $(BUILT_NORM_TAGS)
129-
@echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
130-
diff $(EXPECTED_NORM_TAGS) $(BUILT_NORM_TAGS)
127+
@echo "CHECKING BUILT TAGS AGAINST EXPECTED TAGS"
128+
diff $(EXPECTED_NORM_TAGS) $(BUILT_NORM_TAGS) && echo "diff PASSED" || (echo "diff FAILED"; exit 1)
131129

132130
compare-test-norm-rules: $(EXPECTED_NORM_RULES) $(BUILT_NORM_RULES)
133-
@echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
134-
@echo Comparing $(EXPECTED_NORM_RULES) to $(BUILT_NORM_RULES)
135-
@echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
136-
diff $(EXPECTED_NORM_RULES) $(BUILT_NORM_RULES)
131+
@echo "CHECKING BUILT NORM RULES AGAINST EXPECTED NORM RULES"
132+
diff $(EXPECTED_NORM_RULES) $(BUILT_NORM_RULES) && echo "diff PASSED" || (echo "diff FAILED"; exit 1)
137133

138134
# Update expected files from built files
139135
.PHONY: update-expected

0 commit comments

Comments
 (0)