Run examples test on WCC

  * Maintain binary execution on test
  * Fix passing parent directory on `test-wcc-gen2`

Compiling mandelbrot.c on emcc and running it
causes `Permission Denied.`

It is hard that array cannot use in shell script
because Github Actions causes error.

Author: tyfkda

Makefile

@@ -281,7 +281,7 @@ wcc-gen2:	wcc
 	$(MAKE) HOST_TARGET=wcc HOST_WCC="./wcc" CC="./wcc" WCC_TARGET= wcc-self-hosting
 .PHONY: test-wcc-gen2
 test-wcc-gen2: wcc-gen2
-	$(MAKE) TARGET_CC="../tool/run-gen2wcc.sh" test-wcc-self-hosting
+	XCC_TEST_EXAMPLES_DIR=/examples $(MAKE) TEST_CC="../tool/run-gen2wcc.sh --mapdir=/examples::../examples --" test-wcc-self-hosting
 
 .PHONY: wcc-gen3
 wcc-gen3:	wcc-gen2
@@ -297,7 +297,7 @@ wcc-self-hosting:	$(WCC_TARGET)cc.wasm
 
 .PHONY: test-wcc-self-hosting
 test-wcc-self-hosting:
-	$(MAKE) -C tests clean && $(MAKE) WCC="$(TARGET_CC)" -C tests test-wcc
+	$(MAKE) -C tests clean && $(MAKE) WCC="$(TEST_CC)" -C tests test-wcc
 
 $(WCC_TARGET)cc.wasm:	$(WCC_OBJS)  # $(WCC_PARENT)
 	$(HOST_WCC) -o $@ $(WCC_OBJS)

examples/mandelbrot.c

@@ -71,6 +71,7 @@ int main(int argc, char *argv[]) {
 
     FILE *fp = fopen("mandelbrot.ppm", "wb");
     if (fp == NULL) {
+        perror("fopen");
         exit(1);
     }
     fprintf(fp, "P6\n%d %d\n255\n", (int)W, (int)H);

tests/Makefile

@@ -160,7 +160,7 @@ WCC:=../wcc
 WCC_TESTS:=valtest dvaltest fvaltest
 
 .PHONY: test-wcc
-test-wcc:	test-wcc-sh $(foreach D, $(WCC_TESTS), $(addprefix test-wcc-,$(D)))
+test-wcc:	test-wcc-sh $(foreach D, $(WCC_TESTS), $(addprefix test-wcc-,$(D))) test-wcc-examples
 	@echo 'All tests PASS!'
 
 .PHONY: test-wcc-sh
@@ -171,6 +171,14 @@ test-wcc-sh:
 		AOUT="$(AWASM)" RUN_AOUT="../tool/runwasi $(AWASM)" \
 		./test.sh
 
+.PHONY: test-wcc-examples
+test-wcc-examples:
+	@echo '## example_test.sh'
+	@$(eval AWASM := $(shell basename `mktemp -u`).wasm)
+	@XCC="$(WCC)" RE_SKIP='\/\/-WCC' \
+		AOUT="$(AWASM)" RUN_AOUT="../tool/runwasi --dir=. $(AWASM)" \
+		./example_test.sh
+
 valtest_WCCSRCS:=$(VAL_SRCS)
 dvaltest_WCCSRCS:=$(FVAL_SRCS)
 fvaltest_WCCSRCS:=$(FVAL_SRCS)

tests/cpptest.sh

@@ -15,7 +15,7 @@ function try_run() {
 
   echo -e "$input" | $CPP $ppflags | $CC -o "$AOUT" -Wall -Werror -xc - || exit 1
 
-  $RUN_AOUT
+  ./"$AOUT"
   local actual="$?"
 
   local err=''; [[ "$actual" == "$expected" ]] || err="${expected} expected, but ${actual}"

tests/example_test.sh

@@ -4,20 +4,23 @@ set -o pipefail
 
 source ./test_sub.sh
 
+XCC_TEST_EXAMPLES_DIR=${XCC_TEST_EXAMPLES_DIR:-../examples}
+
 function no_flonum() {
   echo -e "#include <stdio.h>\nint main(){\n#ifdef __NO_FLONUM\nputs(\"true\");\n#endif\nreturn 0;}" | \
-    $XCC -xc - && ${RUN_EXE} ./a.out || exit 1
+    $XCC -o "$AOUT" -xc - && ${RUN_AOUT} || exit 1
 }
 
 function test_all() {
   begin_test_suite "All"
 
-  try_file 'hello' 'Hello, world!' ../examples/hello.c
-  try_file 'fib' 832040 ../examples/fib.c
-  try_file 'echo' 'foo bar baz' ../examples/echo.c foo bar baz
+  try_file 'hello' 'Hello, world!' "${XCC_TEST_EXAMPLES_DIR}"/hello.c
+  try_file 'fib' 832040 "${XCC_TEST_EXAMPLES_DIR}"/fib.c
+  try_file 'echo' 'foo bar baz' "${XCC_TEST_EXAMPLES_DIR}"/echo.c foo bar baz
 
   if [ "$(no_flonum)" != "true" ]; then
-    try_cmp 'mandelbrot' 'mandel256.ppm' 'mandelbrot.ppm' ../examples/mandelbrot.c 100 256 256
+    try_cmp 'mandelbrot' 'mandel256.ppm' 'mandelbrot.ppm' "${XCC_TEST_EXAMPLES_DIR}"/mandelbrot.c \
+        100 256 256
   fi
 
   end_test_suite

tests/test_sub.sh

@@ -42,7 +42,7 @@ function end_test() {
 AOUT=${AOUT:-$(basename "$(mktemp -u)")}
 XCC=${XCC:-../xcc}
 CPP=${CPP:-../cpp}
-RUN_AOUT=${RUN_AOUT:-./"$AOUT"}
+RUN_AOUT=${RUN_AOUT:-"$RUN_EXE ./$AOUT"}
 
 CC=${CC:-cc}
 REMOVE_TOP_LINEMARKER="tail -n +2"  # First line of preprocessor output is linemarker, so remove it.
@@ -112,7 +112,7 @@ function try_file() {
 
   declare -a args=( "$@" )
   local actual
-  actual=$(${RUN_EXE} ./"$AOUT" "${args[@]:3}") > /dev/null 2>&1 || {
+  actual=$(${RUN_AOUT} "${args[@]:3}") > /dev/null 2>&1 || {
     end_test 'Exec failed'
     return
   }
@@ -135,7 +135,7 @@ function try_cmp() {
   }
 
   declare -a args=( "$@" )
-  ${RUN_EXE} ./"$AOUT" "${args[@]:4}" > /dev/null 2>&1 || {
+  ${RUN_AOUT} "${args[@]:4}" > /dev/null 2>&1 || {
     end_test 'Exec failed'
     return
   }

tool/run-gen2wcc.sh

@@ -4,15 +4,50 @@ set -e
 
 PRJROOT=$(cd "$(dirname "$0")/..";pwd)
 WCCWASM=$PRJROOT/cc.wasm
+CWD=.
+EXTRA_OPTS=''
+
+while [ $# -gt 0 ]  # (( $# > 0 ))
+do
+  case $1 in
+    -C | --current-dir | --current-dir=*)
+      if [[ "$1" =~ ^--current-dir= ]]; then
+        CWD=${1#--current-dir=}
+      elif [[ -z "$2" ]] || [[ "$2" =~ ^-+ ]]; then
+        echo "'current-dir' requires an argument." 1>&2
+        exit 1
+      else
+        CWD="$2"
+        shift
+      fi
+      ;;
+    --dir=* | --mapdir=*)
+      EXTRA_OPTS="${EXTRA_OPTS} ""$1"  # Escape required?
+      ;;
+    --)
+      shift
+      break
+      ;;
+    -*)
+      echo "$1: Unkonwn option." 1>&2
+      exit 1
+      ;;
+    *)
+      break
+      ;;
+  esac
+  shift
+done
 
 if [ ! -e "$WCCWASM" ]; then
-    echo "Run 'make wcc-gen2' command to create executable" 1>&2
-    exit 1
+  echo "Run 'make wcc-gen2' command to create executable" 1>&2
+  exit 1
 fi
 
 "$PRJROOT/tool/runwasi" \
-        --dir=. \
-        --dir=/tmp \
-        "--mapdir=/usr/include::$PRJROOT/include" \
-        "--mapdir=/usr/lib::$PRJROOT/lib" \
-    "$WCCWASM" -- "$@"
+  --dir="${CWD}" \
+  --dir=/tmp \
+  "--mapdir=/usr/include::$PRJROOT/include" \
+  "--mapdir=/usr/lib::$PRJROOT/lib" \
+  ${EXTRA_OPTS} \
+  "$WCCWASM" -- "$@"

tool/runwasi.js

@@ -42,7 +42,7 @@ async function getRealpaths(map) {
 
   if (program.args.length <= 0) {
     program.help()
-    process.exit(1)
+    // unreachable.
   }
 
   const wasmFileName = program.args[0]