try to fix gcc.dg/* job

pipcet · Jan 27, 2021 · d0ba5f3 · d0ba5f3
1 parent bdd8a4e
commit d0ba5f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/gcc-testsuite.yml b/.github/workflows/gcc-testsuite.yml
@@ -15,6 +15,7 @@ jobs:
     - name: Set env variables
       uses: ./github/env/
     - run: JS=$(pwd)/bin/js WASMDIR=$(pwd) PATH=$PATH:$(pwd)/wasm32-unknown-none/bin make GITHUB=1 -kj10 gcc.c-torture/compile/compile.exp.{daily-dejanew}!
+    - run: make GITHUB=1 -kj10 artifact-push!
 
   gcc-c-torture-execute:
     name: gcc.c-torture/execute
@@ -26,6 +27,7 @@ jobs:
     - name: Set env variables
       uses: ./github/env/
     - run: JS=$(pwd)/bin/js WASMDIR=$(pwd) PATH=$PATH:$(pwd)/wasm32-unknown-none/bin make GITHUB=1 -kj10 gcc.c-torture/execute/execute.exp.{daily-dejanew}!
+    - run: make GITHUB=1 -kj10 artifact-push!
 
   gcc-c-torture-execute-builtins:
     name: gcc.c-torture/execute/builtins
@@ -37,6 +39,7 @@ jobs:
     - name: Set env variables
       uses: ./github/env/
     - run: JS=$(pwd)/bin/js WASMDIR=$(pwd) PATH=$PATH:$(pwd)/wasm32-unknown-none/bin make GITHUB=1 -kj10 gcc.c-torture/execute/builtins/builtins.exp.{daily-dejanew}!
+    - run: make GITHUB=1 -kj10 artifact-push!
 
   gcc-c-torture-execute-ieee:
     name: gcc.c-torture/execute/ieee
@@ -48,6 +51,7 @@ jobs:
     - name: Set env variables
       uses: ./github/env/
     - run: JS=$(pwd)/bin/js WASMDIR=$(pwd) PATH=$PATH:$(pwd)/wasm32-unknown-none/bin make GITHUB=1 -kj10 gcc.c-torture/execute/ieee/ieee.exp.{daily-dejanew}!
+    - run: make GITHUB=1 -kj10 artifact-push!
 
   gcc-dg-dg:
     name: gcc.dg/dg.exp
@@ -59,6 +63,8 @@ jobs:
     - name: Set env variables
       uses: ./github/env/
     - run: JS=$(pwd)/bin/js WASMDIR=$(pwd) PATH=$PATH:$(pwd)/wasm32-unknown-none/bin make GITHUB=1 -kj10 gcc.dg/dg.exp.{daily-dejanew}!
+    - run: make GITHUB=1 -kj10 artifact-push!
+
   gcc-dg-misc:
     name: gcc.dg/*
     runs-on: ubuntu-latest
@@ -77,3 +83,4 @@ jobs:
     - run: JS=$(pwd)/bin/js WASMDIR=$(pwd) PATH=$PATH:$(pwd)/wasm32-unknown-none/bin make GITHUB=1 -kj10 gcc.dg/debug/tls/tls.exp.{daily-dejanew}!
     - run: JS=$(pwd)/bin/js WASMDIR=$(pwd) PATH=$PATH:$(pwd)/wasm32-unknown-none/bin make GITHUB=1 -kj10 gcc.dg/debug/tm/tm.exp.{daily-dejanew}!
     - run: JS=$(pwd)/bin/js WASMDIR=$(pwd) PATH=$PATH:$(pwd)/wasm32-unknown-none/bin make GITHUB=1 -kj10 gcc.dg/debug/weak/weak.exp.{daily-dejanew}!
+    - run: make GITHUB=1 -kj10 artifact-push!
diff --git a/Makefile b/Makefile
@@ -818,7 +818,7 @@ artifact-push!:
 	$(MAKE) extracted/daily/gcc-preliminary.tar.gz
 	$(MAKE) extracted/daily/gcc.tar.gz
 	$(MAKE) bin/js
-	mkdir wasm
+	$(MKDIR) wasm
 	$(MAKE) wasm/ld.wasm
 	$(MAKE) wasm/libc.wasm
 	$(MAKE) wasm/libdl.wasm
@@ -829,17 +829,15 @@ artifact-push!:
 	$(MAKE) artifacts artifact-timestamp
 	JS=$(PWD)/bin/js WASMDIR=$(PWD) $(MAKE) build/wasm32/gcc-testsuite/$*.{dejagnu}.tar
 	cp build/wasm32/gcc-testsuite/$*.{dejagnu}.tar artifacts/
-	$(MAKE) artifact-push!
 
 %.{dejanew}!: js/wasm32.js install/texinfo-bison-flex install/gcc-dependencies install/dejagnu | extracted/artifacts/toolchain.tar tools/bin/wasmrewrite tools/bin/wasmsect install/binfmt_misc/wasm install/binfmt_misc/elf32-wasm32 artifacts/libc.wasm artifacts/ld.wasm artifacts/libm.wasm subrepos/gcc/checkout! artifacts src/gcc
 	$(MAKE) artifacts/jsshell-linux-x86_64.zip
 	unzip artifacts/jsshell-linux-x86_64.zip -d bin
-	mkdir wasm
+	$(MKDIR) wasm
 	cp artifacts/*.wasm wasm
 	$(MAKE) artifact-timestamp
 	$(MAKE) build/wasm32/gcc-testsuite/$*.{dejagnu}.tar
 	cp build/wasm32/gcc-testsuite/$*.{dejagnu}.tar artifacts/
-	$(MAKE) artifact-push!
 
 binutils-test!: install/dejagnu
 	$(MAKE) subrepos/binutils-gdb/checkout!