diff options
| author | Bernhard Nortmann <bernhard.nortmann@web.de> | 2016-10-29 15:47:28 +0300 |
|---|---|---|
| committer | Bernhard Nortmann <bernhard.nortmann@web.de> | 2017-02-13 18:37:44 +0300 |
| commit | b106aeb310fed71b3f628ce6abf7e0f866aa3043 (patch) | |
| tree | 8f07c5274b416b8d5e9815c5bd38916b84701ca1 | |
| parent | 0f1b5c1d723637fec90f3e567d6338476eaf048b (diff) | |
appveyor: Work around incorrect "find" invocationwindows
test_all_fex.sh now accepts an optional second parameter that
specifies the find executable to use. Without explicitly passing
it, AppVeyor would invoke the wrong one (Windows' own find.exe).
Signed-off-by: Bernhard Nortmann <bernhard.nortmann@web.de>
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rwxr-xr-x | tests/test_all_fex.sh | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index c439965..c11d119 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ build_script: - cmd: mingw32-make misc test_script: - - cmd: mingw32-make -C tests/ check_all_fex + - cmd: mingw32-make -C tests/ check_all_fex FIND=/bin/find after_test: - cmd: .appveyor/package-artifacts.cmd diff --git a/tests/Makefile b/tests/Makefile index f3560a3..d5833e5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -9,7 +9,7 @@ check: check_all_fex coverage # Conversion cycle (.fex -> .bin -> .fex) test for all sunxi-boards check_all_fex: $(BOARDS_DIR)/README unify-fex - ./test_all_fex.sh $(BOARDS_DIR) + ./test_all_fex.sh $(BOARDS_DIR) $(FIND) coverage: # Usage help / invocation with no args diff --git a/tests/test_all_fex.sh b/tests/test_all_fex.sh index f22325e..43ed99b 100755 --- a/tests/test_all_fex.sh +++ b/tests/test_all_fex.sh @@ -1,6 +1,11 @@ #!/bin/sh FEXFILES=fexfiles.lst -find $1 -name '*.fex' > ${FEXFILES} +if test -z $2; then + FIND=find +else + FIND=$2 +fi +${FIND} $1 -name '*.fex' > ${FEXFILES} while read fex; do ./fextest.sh ${fex} || exit done <${FEXFILES} |