diff options
| author | MITSUNARI Shigeo <[email protected]> | 2022-12-05 12:09:37 +0900 |
|---|---|---|
| committer | MITSUNARI Shigeo <[email protected]> | 2022-12-05 12:09:37 +0900 |
| commit | d8c332cefe2e9321cbf0ff0f539cc8e595b581c8 (patch) | |
| tree | 1aac16d26ac3d0c2c7137132b32dd653d1c8dabe | |
| parent | 1efe9fe7cbdb1fea02aa0d144a23480a8edafa1f (diff) | |
| parent | 8a974696cbcaab440a6a7dde295c03aa45a2539f (diff) | |
| download | xbyak-d8c332cefe2e9321cbf0ff0f539cc8e595b581c8.tar.gz xbyak-d8c332cefe2e9321cbf0ff0f539cc8e595b581c8.zip | |
Merge branch 'Tachi107-small-changes' into dev
| -rw-r--r-- | test/Makefile | 30 | ||||
| -rwxr-xr-x | test/test_address.sh | 2 | ||||
| -rwxr-xr-x | test/test_avx.sh | 2 | ||||
| -rwxr-xr-x | test/test_avx512.sh | 2 | ||||
| -rwxr-xr-x | test/test_nm.sh | 2 |
5 files changed, 23 insertions, 15 deletions
diff --git a/test/Makefile b/test/Makefile index feef445..70bf70f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -56,11 +56,11 @@ noexception: noexception.cpp ../xbyak/xbyak.h test_nm: normalize_prefix $(TARGET) $(MAKE) -C ../gen ifneq ($(ONLY_64BIT),1) - env CXX=$(CXX) sh -e ./test_nm.sh - env CXX=$(CXX) sh -e ./test_nm.sh noexcept - env CXX=$(CXX) sh -e ./test_nm.sh Y - env CXX=$(CXX) sh -e ./test_nm.sh avx512 - env CXX=$(CXX) sh -e ./test_address.sh + CXX=$(CXX) ./test_nm.sh + CXX=$(CXX) ./test_nm.sh noexcept + CXX=$(CXX) ./test_nm.sh Y + CXX=$(CXX) ./test_nm.sh avx512 + CXX=$(CXX) ./test_address.sh ./jmp ./cvt_test32 endif @@ -69,36 +69,36 @@ endif ./misc32 ./cvt_test ifeq ($(BIT),64) - env CXX=$(CXX) sh -e ./test_address.sh 64 + CXX=$(CXX) ./test_address.sh 64 ifneq ($(X32),1) - env CXX=$(CXX) sh -e ./test_nm.sh 64 - env CXX=$(CXX) sh -e ./test_nm.sh Y64 + CXX=$(CXX) ./test_nm.sh 64 + CXX=$(CXX) ./test_nm.sh Y64 endif ./jmp64 endif test_avx: normalize_prefix ifneq ($(ONLY_64BIT),0) - env CXX=$(CXX) sh -e ./test_avx.sh - env CXX=$(CXX) sh -e ./test_avx.sh Y + CXX=$(CXX) ./test_avx.sh + CXX=$(CXX) ./test_avx.sh Y endif ifeq ($(BIT),64) - env CXX=$(CXX) sh -e ./test_avx.sh 64 + CXX=$(CXX) ./test_avx.sh 64 ifneq ($(X32),1) - env CXX=$(CXX) sh -e ./test_avx.sh Y64 + CXX=$(CXX) ./test_avx.sh Y64 endif endif test_avx512: normalize_prefix ifneq ($(ONLY_64BIT),0) - env CXX=$(CXX) sh -e ./test_avx512.sh + CXX=$(CXX) ./test_avx512.sh endif ifeq ($(BIT),64) - env CXX=$(CXX) sh -e ./test_avx512.sh 64 + CXX=$(CXX) ./test_avx512.sh 64 endif detect_x32: detect_x32.c - $(CC) $< -o $@ + $(CC) $(CFLAGS) $< -o $@ test: detect_x32 $(MAKE) test_nm diff --git a/test/test_address.sh b/test/test_address.sh index 7960700..6c9e9b0 100755 --- a/test/test_address.sh +++ b/test/test_address.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + FILTER="grep -v warning" sub() diff --git a/test/test_avx.sh b/test/test_avx.sh index 35087cd..647d4d3 100755 --- a/test/test_avx.sh +++ b/test/test_avx.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + FILTER="grep -v warning" CXX=${CXX:=g++} diff --git a/test/test_avx512.sh b/test/test_avx512.sh index 90d14df..01079f1 100755 --- a/test/test_avx512.sh +++ b/test/test_avx512.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + FILTER="grep -v warning" CXX=${CXX:=g++} diff --git a/test/test_nm.sh b/test/test_nm.sh index 019f278..cda7d88 100755 --- a/test/test_nm.sh +++ b/test/test_nm.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + FILTER=cat CXX=${CXX:=g++} |