Skip to content

Commit 6f65d61

Browse files
committed
---
yaml --- r: 6331 b: refs/heads/master c: 938b23e h: refs/heads/master i: 6329: 52e736c 6327: 2d9ba5d v: v3
1 parent 1fd6514 commit 6f65d61

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 62b298ee133d04ec88a252176fcfeb0da895181b
2+
refs/heads/master: 938b23e228f4fd313973190f8f78163476cc4a3f

trunk/mk/tests.mk

+18-18
Original file line numberDiff line numberDiff line change
@@ -233,56 +233,56 @@ PRETTY_PRETTY_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
233233
--mode pretty
234234

235235
check-stage$(1)-$(2)-cfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
236-
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
237-
$$(CFAIL_TESTS)
236+
$$(SREQ$(1)$(2)) \
237+
$$(CFAIL_TESTS)
238238
@$$(call E, run: $$<)
239239
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(CFAIL_ARGS$(1)-$(2))
240240

241241
check-stage$(1)-$(2)-rfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
242-
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
243-
$$(RFAIL_TESTS)
242+
$$(SREQ$(1)$(2)) \
243+
$$(RFAIL_TESTS)
244244
@$$(call E, run: $$<)
245245
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RFAIL_ARGS$(1)-$(2))
246246

247247
check-stage$(1)-$(2)-rpass-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
248-
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
249-
$$(RPASS_TESTS)
248+
$$(SREQ$(1)$(2)) \
249+
$$(RPASS_TESTS)
250250
@$$(call E, run: $$<)
251251
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RPASS_ARGS$(1)-$(2))
252252

253253
check-stage$(1)-$(2)-bench-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
254-
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
255-
$$(BENCH_TESTS)
254+
$$(SREQ$(1)$(2)) \
255+
$$(BENCH_TESTS)
256256
@$$(call E, run: $$<)
257257
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(BENCH_ARGS$(1)-$(2))
258258

259259
check-stage$(1)-$(2)-perf-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
260-
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
261-
$$(BENCH_TESTS)
260+
$$(SREQ$(1)$(2)) \
261+
$$(BENCH_TESTS)
262262
@$$(call E, perf: $$<)
263263
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PERF_ARGS$(1)-$(2))
264264

265265
check-stage$(1)-$(2)-pretty-rpass-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
266-
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
267-
$$(RPASS_TESTS)
266+
$$(SREQ$(1)$(2)) \
267+
$$(RPASS_TESTS)
268268
@$$(call E, run: $$<)
269269
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RPASS_ARGS$(1)-$(2))
270270

271271
check-stage$(1)-$(2)-pretty-rfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
272-
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
273-
$$(RFAIL_TESTS)
272+
$$(SREQ$(1)$(2)) \
273+
$$(RFAIL_TESTS)
274274
@$$(call E, run: $$<)
275275
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RFAIL_ARGS$(1)-$(2))
276276

277277
check-stage$(1)-$(2)-pretty-bench-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
278-
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
279-
$$(BENCH_TESTS)
278+
$$(SREQ$(1)$(2)) \
279+
$$(BENCH_TESTS)
280280
@$$(call E, run: $$<)
281281
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_BENCH_ARGS$(1)-$(2))
282282

283283
check-stage$(1)-$(2)-pretty-pretty-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
284-
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
285-
$$(PRETTY_TESTS)
284+
$$(SREQ$(1)$(2)) \
285+
$$(PRETTY_TESTS)
286286
@$$(call E, run: $$<)
287287
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_PRETTY_ARGS$(1)-$(2))
288288

0 commit comments

Comments
 (0)