Skip to content

Commit b33ce2a

Browse files
committed
fbc-tests: update tests/Makefile and tests/log-tests.mk
- Export FBC variable in Makefile so that calling tests/log-tests.mk and tests/unit-tests.mk gets the value used - fix argument ordering on 'find' statements to avoid the positional warnings on gnu/find
1 parent 6c8a2bc commit b33ce2a

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

tests/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ PRINTF := printf
2222
ifndef FBC
2323
FBC := fbc$(EXEEXT)
2424
endif
25+
export FBC
2526

2627
ENABLE_CHECK_BUGS :=
2728
export ENABLE_CHECK_BUGS

tests/log-tests.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ $(FAILED_LOG_TESTS_INC) :
289289
@$(ECHO) "#" >> $(FAILED_LOG_TESTS_INC)
290290

291291
@$(PRINTF) "."
292-
@$(FIND) $(DIRLIST) -type f -name -mindepth 1 '*.log' -mindepth 1 \
292+
@$(FIND) $(DIRLIST) -mindepth 1 -type f -name '*.log' \
293293
| $(XARGS) $(GREP) -l -i -E '^.*[[:space:]]*:[[:space:]]*RESULT=FAILED' \
294294
| $(SED) -e 's/\(^.*\)[[:space:]]\:[[:space:]]TESTMODE=\(.*\)/SRCLIST_\2 \+\= \1/g' \
295295
>> $(FAILED_LOG_TESTS_INC)
@@ -307,42 +307,42 @@ $(LOG_TESTS_INC) :
307307
@$(ECHO) "#" >> $(LOG_TESTS_INC)
308308

309309
@$(PRINTF) "."
310-
@$(FIND) $(DIRLIST) -type f -name '*.bas' -or -name '*.bmk' -mindepth 1 \
310+
@$(FIND) $(DIRLIST) -mindepth 1 -type f -name '*.bas' -or -name '*.bmk' \
311311
| $(XARGS) $(GREP) -l -i -E '[[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*COMPILE_ONLY_OK' \
312312
| $(SED) -e 's/\(^.*\)/\SRCLIST_COMPILE_ONLY_OK \+\= \.\/\1/g' \
313313
>> $(LOG_TESTS_INC)
314314
@$(ECHO) "#" >> $(LOG_TESTS_INC)
315315

316316
@$(PRINTF) "."
317-
@$(FIND) $(DIRLIST) -type f -name '*.bas' -or -name '*.bmk' -mindepth 1 \
317+
@$(FIND) $(DIRLIST) -mindepth 1 -type f -name '*.bas' -or -name '*.bmk' \
318318
| $(XARGS) $(GREP) -l -i -E '[[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*COMPILE_ONLY_FAIL' \
319319
| $(SED) -e 's/\(^.*\)/\SRCLIST_COMPILE_ONLY_FAIL \+\= \.\/\1/g' \
320320
>> $(LOG_TESTS_INC)
321321
@$(ECHO) "#" >> $(LOG_TESTS_INC)
322322

323323
@$(PRINTF) "."
324-
@$(FIND) $(DIRLIST) -type f -name '*.bas' -or -name '*.bmk' -mindepth 1 \
324+
@$(FIND) $(DIRLIST) -mindepth 1 -type f -name '*.bas' -or -name '*.bmk' \
325325
| $(XARGS) $(GREP) -l -i -E '[[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*COMPILE_AND_RUN_OK' \
326326
| $(SED) -e 's/\(^.*\)/\SRCLIST_COMPILE_AND_RUN_OK \+\= \.\/\1/g' \
327327
>> $(LOG_TESTS_INC)
328328
@$(ECHO) "#" >> $(LOG_TESTS_INC)
329329

330330
@$(PRINTF) "."
331-
@$(FIND) $(DIRLIST) -type f -name '*.bas' -or -name '*.bmk' -mindepth 1 \
331+
@$(FIND) $(DIRLIST) -mindepth 1 -type f -name '*.bas' -or -name '*.bmk' \
332332
| $(XARGS) $(GREP) -l -i -E '[[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*COMPILE_AND_RUN_FAIL' \
333333
| $(SED) -e 's/\(^.*\)/\SRCLIST_COMPILE_AND_RUN_FAIL \+\= \.\/\1/g' \
334334
>> $(LOG_TESTS_INC)
335335
@$(ECHO) "#" >> $(LOG_TESTS_INC)
336336

337337
@$(PRINTF) "."
338-
@$(FIND) $(DIRLIST) -type f -name '*.bmk' -mindepth 1 \
338+
@$(FIND) $(DIRLIST) -mindepth 1 -type f -name '*.bmk' \
339339
| $(XARGS) $(GREP) -l -i -E '[[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*MULTI_MODULE_OK' \
340340
| $(SED) -e 's/\(^.*\)/\SRCLIST_MULTI_MODULE_OK \+\= \.\/\1/g' \
341341
>> $(LOG_TESTS_INC)
342342
@$(ECHO) "#" >> $(LOG_TESTS_INC)
343343

344344
@$(PRINTF) "."
345-
@$(FIND) $(DIRLIST) -type f -name '*.bmk' -mindepth 1 \
345+
@$(FIND) $(DIRLIST) -mindepth 1 -type f -name '*.bmk' \
346346
| $(XARGS) $(GREP) -l -i -E '[[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*MULTI_MODULE_FAIL' \
347347
| $(SED) -e 's/\(^.*\)/\SRCLIST_MULTI_MODULE_FAIL \+\= \.\/\1/g' \
348348
>> $(LOG_TESTS_INC)

0 commit comments

Comments
 (0)