summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Moinvaziri <nathan@nathanm.com>2022-10-11 11:10:17 -0700
committerMark Adler <fork@madler.net>2022-10-11 20:21:50 -0700
commitda6f1623c177c5ebfa2b1ee3b50eb297da5a77e1 (patch)
treece98b61d2cff128805f752e4b05b86fd6840d80b
parentb85c172e1d3d10dfe911dd2686d4da715070cada (diff)
downloadzlib-da6f1623c177c5ebfa2b1ee3b50eb297da5a77e1.tar.gz
zlib-da6f1623c177c5ebfa2b1ee3b50eb297da5a77e1.tar.bz2
zlib-da6f1623c177c5ebfa2b1ee3b50eb297da5a77e1.zip
CI: Run test applications against QEMU.
-rw-r--r--.github/workflows/configure.yml2
-rw-r--r--Makefile.in8
2 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index c34a82c..dcdd4b5 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -78,6 +78,8 @@ jobs:
78 make test 78 make test
79 make cover 79 make cover
80 working-directory: ${{ matrix.build-dir }} 80 working-directory: ${{ matrix.build-dir }}
81 env:
82 QEMU_RUN: ${{ matrix.qemu-run }}
81 83
82 - name: Upload build errors 84 - name: Upload build errors
83 uses: actions/upload-artifact@v3 85 uses: actions/upload-artifact@v3
diff --git a/Makefile.in b/Makefile.in
index 2dedc44..f97efc2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,7 +83,7 @@ test: all teststatic testshared
83 83
84teststatic: static 84teststatic: static
85 @TMPST=tmpst_$$; \ 85 @TMPST=tmpst_$$; \
86 if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \ 86 if echo hello world | ${QEMU_RUN} ./minigzip | ${QEMU_RUN} ./minigzip -d && ${QEMU_RUN} ./example $$TMPST ; then \
87 echo ' *** zlib test OK ***'; \ 87 echo ' *** zlib test OK ***'; \
88 else \ 88 else \
89 echo ' *** zlib test FAILED ***'; false; \ 89 echo ' *** zlib test FAILED ***'; false; \
@@ -96,7 +96,7 @@ testshared: shared
96 DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \ 96 DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
97 SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \ 97 SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
98 TMPSH=tmpsh_$$; \ 98 TMPSH=tmpsh_$$; \
99 if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \ 99 if echo hello world | ${QEMU_RUN} ./minigzipsh | ${QEMU_RUN} ./minigzipsh -d && ${QEMU_RUN} ./examplesh $$TMPSH; then \
100 echo ' *** zlib shared test OK ***'; \ 100 echo ' *** zlib shared test OK ***'; \
101 else \ 101 else \
102 echo ' *** zlib shared test FAILED ***'; false; \ 102 echo ' *** zlib shared test FAILED ***'; false; \
@@ -105,7 +105,7 @@ testshared: shared
105 105
106test64: all64 106test64: all64
107 @TMP64=tmp64_$$; \ 107 @TMP64=tmp64_$$; \
108 if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \ 108 if echo hello world | ${QEMU_RUN} ./minigzip64 | ${QEMU_RUN} ./minigzip64 -d && ${QEMU_RUN} ./example64 $$TMP64; then \
109 echo ' *** zlib 64-bit test OK ***'; \ 109 echo ' *** zlib 64-bit test OK ***'; \
110 else \ 110 else \
111 echo ' *** zlib 64-bit test FAILED ***'; false; \ 111 echo ' *** zlib 64-bit test FAILED ***'; false; \
@@ -120,7 +120,7 @@ infcover: infcover.o libz.a
120 120
121cover: infcover 121cover: infcover
122 rm -f *.gcda 122 rm -f *.gcda
123 ./infcover 123 ${QEMU_RUN} ./infcover
124 gcov inf*.c 124 gcov inf*.c
125 125
126libz.a: $(OBJS) 126libz.a: $(OBJS)