Merge branch 'dev'

.github/workflows/main.yml

@@ -1,15 +1,21 @@
 name: test
 on: [push]
 
+defaults:
+  run:
+    shell: sh
+
+permissions:
+  contents: read
+
 jobs:
-  build:
-    name: test
+  test:
     runs-on: ubuntu-latest
+    container:
+      image: debian:testing
     steps:
-    - uses: actions/checkout@v2
-    - run: sudo apt update
-    - run: sudo apt install yasm g++-multilib tcsh
-    - run: wget https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz
-    - run: tar xvfz nasm-2.15.05.tar.gz && cd nasm-2.15.05 && ./configure && make && sudo make install && cd ..
+    - uses: actions/checkout@v3
+    - run: apt -y update
+    - run: apt -y install g++-multilib libboost-dev make nasm yasm
     - run: make test
     - run: make -C sample CXXFLAGS="-DXBYAK_NO_EXCEPTION"

sample/Makefile

@@ -1,9 +1,7 @@
 XBYAK_INC=../xbyak/xbyak.h
 CXX?=g++
 
-#BOOST_EXIST=$(shell echo "#include <boost/spirit/core.hpp>" | $(CXX) -x c++ -c - 2>/dev/null && echo 1)
-# I don't know why the above code causes an error on GitHub action.
-BOOST_EXIST?=0
+BOOST_EXIST=$(shell echo "#include <boost/spirit/core.hpp>" | $(CXX) -x c++ -c - 2>/dev/null && echo 1)
 UNAME_M=$(shell uname -m)
 
 ONLY_64BIT=0

test/Makefile

@@ -2,7 +2,7 @@ TARGET = make_nm normalize_prefix bad_address misc cvt_test cvt_test32 noexcepti
 XBYAK_INC=../xbyak/xbyak.h
 UNAME_S=$(shell uname -s)
 ifeq ($(shell ./detect_x32),x32)
-X32=1
+X32?=1
 endif
 BIT=32
 ifeq ($(shell uname -m),x86_64)
@@ -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,32 +69,32 @@ 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

test/test_address.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 FILTER="grep -v warning"
 
 sub()

test/test_avx.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 FILTER="grep -v warning"
 CXX=${CXX:=g++}
 

test/test_avx512.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 FILTER="grep -v warning"
 CXX=${CXX:=g++}
 

test/test_nm.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 FILTER=cat
 CXX=${CXX:=g++}