Skip to content

Commit 5703380

Browse files
bogglebrson
authored andcommitted
---
yaml --- r: 6410 b: refs/heads/master c: 25b44a8 h: refs/heads/master v: v3
1 parent 46f3631 commit 5703380

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: b6af844f3a9078834dd06c7187f5c2f4f90ca324
2+
refs/heads/master: 25b44a8973e86c6f13c80c646914beb876e2e2bd

trunk/mk/tests.mk

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,27 @@ check-fast: tidy \
8080
test/$(FT_DRIVER).out
8181

8282
# Run the tidy script in multiple parts to avoid huge 'echo' commands
83+
ifdef CFG_NOTIDY
8384
tidy:
84-
@$(call E, check: formatting)
85-
$(Q)echo \
86-
$(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
87-
$(RUSTLLVM_HDR) \
88-
$(RUNTIME_CS) $(RUNTIME_HDR) $(RUNTIME_S)) \
89-
$(wildcard $(S)src/etc/*.py) \
90-
$(COMPILER_CRATE) \
91-
$(COMPILER_INPUTS) \
92-
$(STDLIB_CRATE) \
93-
$(STDLIB_INPUTS) \
94-
$(COMPILETEST_CRATE) \
95-
$(COMPILETEST_INPUTS) \
96-
| xargs -n 10 python $(S)src/etc/tidy.py
97-
$(Q)echo \
98-
$(ALL_TEST_INPUTS) \
99-
| xargs -n 10 python $(S)src/etc/tidy.py
100-
85+
else
86+
tidy:
87+
@$(call E, check: formatting)
88+
$(Q)echo \
89+
$(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
90+
$(RUSTLLVM_HDR) \
91+
$(RUNTIME_CS) $(RUNTIME_HDR) $(RUNTIME_S)) \
92+
$(wildcard $(S)src/etc/*.py) \
93+
$(COMPILER_CRATE) \
94+
$(COMPILER_INPUTS) \
95+
$(STDLIB_CRATE) \
96+
$(STDLIB_INPUTS) \
97+
$(COMPILETEST_CRATE) \
98+
$(COMPILETEST_INPUTS) \
99+
| xargs -n 10 python $(S)src/etc/tidy.py
100+
$(Q)echo \
101+
$(ALL_TEST_INPUTS) \
102+
| xargs -n 10 python $(S)src/etc/tidy.py
103+
endif
101104

102105
######################################################################
103106
# Rules for the test runners

0 commit comments

Comments
 (0)