Skip to content

Commit 89aaf1c

Browse files
scaprilescaprile
committed
move Makefile to test/
1 parent 601af78 commit 89aaf1c

File tree

14 files changed

+792
-139
lines changed

14 files changed

+792
-139
lines changed

‎.github/workflows/cifuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
Fuzzing:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
with: { fetch-depth: 2 }
1414
- run: if ./test/match_changed_files.sh '^src/' ; then echo GO=1 >> $GITHUB_ENV ; fi
1515
- name: Build Fuzzers

‎.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
with:
2626
languages: cpp
2727
- run: |
28-
make test CC=gcc ASAN= ASAN_OPTIONS=
29-
./test/setup_ga_network.sh && make mip_test CC=gcc ASAN= ASAN_OPTIONS=
28+
make -C test test CC=gcc ASAN= ASAN_OPTIONS=
29+
./test/setup_ga_network.sh && make -C test mip_test CC=gcc ASAN= ASAN_OPTIONS=
3030
3131
- name: Perform CodeQL Analysis
3232
uses: github/codeql-action/analyze@v2

‎.github/workflows/nightly.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
steps:
3434
- uses: actions/checkout@v4
3535
with: { fetch-depth: 2 }
36-
- run: ./test/setup_ga_network.sh && sudo apt -y update ; sudo apt -y install libmbedtls-dev && make ${{ matrix.target }}
36+
- run: ./test/setup_ga_network.sh && sudo apt -y update ; sudo apt -y install libmbedtls-dev && make -C test ${{ matrix.target }}
3737
s390:
3838
runs-on: ubuntu-latest
3939
strategy:
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@v4
4646
with: { fetch-depth: 2 }
47-
- run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make s390 SSL=${{ matrix.ssl }}
47+
- run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make -C test s390 SSL=${{ matrix.ssl }}
4848
armhf:
4949
runs-on: ubuntu-latest
5050
strategy:
@@ -55,7 +55,7 @@ jobs:
5555
steps:
5656
- uses: actions/checkout@v4
5757
with: { fetch-depth: 2 }
58-
- run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make armhf SSL=${{ matrix.ssl }}
58+
- run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make -C test armhf SSL=${{ matrix.ssl }}
5959
unamalgamated-mg_prefix:
6060
runs-on: ubuntu-latest
6161
strategy:
@@ -67,7 +67,7 @@ jobs:
6767
- uses: actions/checkout@v4
6868
with: { fetch-depth: 2 }
6969
- run: sudo apt -y update ; sudo apt -y install libmbedtls-dev
70-
- run: make unamalgamated && make mg_prefix
70+
- run: make -C test unamalgamated && make -C test mg_prefix
7171
valgrind:
7272
runs-on: ubuntu-latest
7373
strategy:
@@ -79,7 +79,7 @@ jobs:
7979
- uses: actions/checkout@v4
8080
with: { fetch-depth: 2 }
8181
- run: sudo apt -y update ; sudo apt -y install libmbedtls-dev valgrind
82-
- run: make valgrind SSL=${{ matrix.ssl }}
82+
- run: make -C test valgrind SSL=${{ matrix.ssl }}
8383
macos:
8484
runs-on: macos-latest
8585
strategy:
@@ -101,7 +101,7 @@ jobs:
101101
- uses: actions/checkout@v4
102102
with: { fetch-depth: 2 }
103103
- run: brew install jq mbedtls openssl
104-
- run: make test ASAN_OPTIONS= MBEDTLS=`echo /usr/local/Cellar/mbedtls*/*` OPENSSL=`echo /usr/local/Cellar/openssl*/*`
104+
- run: make -C test test ASAN_OPTIONS= MBEDTLS=`echo /usr/local/Cellar/mbedtls*/*` OPENSSL=`echo /usr/local/Cellar/openssl*/*`
105105
windows:
106106
runs-on: ubuntu-latest
107107
strategy:
@@ -121,7 +121,7 @@ jobs:
121121
steps:
122122
- uses: actions/checkout@v4
123123
with: { fetch-depth: 2 }
124-
- run: make ${{ matrix.target }}
124+
- run: make -C test ${{ matrix.target }}
125125
arm:
126126
runs-on: ubuntu-latest
127127
strategy:
@@ -131,7 +131,7 @@ jobs:
131131
name: Arm SSL=${{ matrix.ssl }}
132132
steps:
133133
- uses: actions/checkout@v4
134-
- run: make arm SSL=${{ matrix.ssl }}
134+
- run: make -C test arm SSL=${{ matrix.ssl }}
135135
riscv:
136136
runs-on: ubuntu-latest
137137
strategy:
@@ -141,7 +141,7 @@ jobs:
141141
name: RISC-V SSL=${{ matrix.ssl }}
142142
steps:
143143
- uses: actions/checkout@v4
144-
- run: make riscv SSL=${{ matrix.ssl }}
144+
- run: make -C test riscv SSL=${{ matrix.ssl }}
145145

146146
examples:
147147
runs-on: ubuntu-latest
@@ -153,8 +153,8 @@ jobs:
153153
steps:
154154
- uses: actions/checkout@v4
155155
- run: sudo apt -y install libmbedtls-dev libpcap-dev
156-
- run: make examples CFLAGS_EXTRA="${{ matrix.ssl }}"
157-
- run: make clean_examples
156+
- run: make -C test examples CFLAGS_EXTRA="${{ matrix.ssl }}"
157+
- run: make -C test clean_examples
158158
examples_win:
159159
runs-on: windows-latest
160160
strategy:
@@ -168,10 +168,10 @@ jobs:
168168
# with:
169169
# platform: x64
170170
- name: test they build
171-
run: make examples_win CFLAGS_EXTRA="${{ matrix.ssl }}"
171+
run: make -C test examples_win CFLAGS_EXTRA="${{ matrix.ssl }}"
172172
shell: cmd
173173
- name: test they clean
174-
run: make clean_examples_win
174+
run: make -C test clean_examples_win
175175
shell: cmd
176176
examples_mac:
177177
runs-on: macos-latest
@@ -183,8 +183,8 @@ jobs:
183183
name: examples_mac ${{ matrix.ssl }}
184184
steps:
185185
- uses: actions/checkout@v4
186-
- run: make examples_mac CFLAGS_EXTRA="${{ matrix.ssl }}"
187-
- run: make clean_examples_mac
186+
- run: make -C test examples_mac CFLAGS_EXTRA="${{ matrix.ssl }}"
187+
- run: make -C test clean_examples_mac
188188

189189

190190
arduino:

‎.github/workflows/quicktest.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,31 @@ jobs:
2525
with: { fetch-depth: 2 }
2626
- run: if ./test/match_changed_files.sh '^test|^src/.*.[ch]' ; then echo GO=1 >> $GITHUB_ENV ; fi
2727
- if: ${{ env.GO == 1 }}
28-
run: ./test/setup_ga_network.sh && make ${{ matrix.target }}
28+
run: ./test/setup_ga_network.sh && make -C test ${{ matrix.target }}
2929
s390:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- uses: actions/checkout@v4
3333
with: { fetch-depth: 2 }
3434
- run: if ./test/match_changed_files.sh '^test|^src/.*.[ch]' ; then echo GO=1 >> $GITHUB_ENV ; fi
3535
- if: ${{ env.GO == 1 }}
36-
run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make s390
36+
run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make -C test s390
3737
armhf:
3838
runs-on: ubuntu-latest
3939
steps:
4040
- uses: actions/checkout@v4
4141
with: { fetch-depth: 2 }
4242
- run: if ./test/match_changed_files.sh '^test|^src/.*.[ch]' ; then echo GO=1 >> $GITHUB_ENV ; fi
4343
- if: ${{ env.GO == 1 }}
44-
run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make armhf
44+
run: sudo apt -y update ; sudo apt -y install qemu binfmt-support qemu-user-static && docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && make -C test armhf
4545
unamalgamated-mg_prefix:
4646
runs-on: ubuntu-latest
4747
steps:
4848
- uses: actions/checkout@v4
4949
with: { fetch-depth: 2 }
5050
- run: if ./test/match_changed_files.sh '^test|^src/.*.[ch]' ; then echo GO=1 >> $GITHUB_ENV ; fi
5151
- if: ${{ env.GO == 1 }}
52-
run: make unamalgamated && make mg_prefix
52+
run: make -C test unamalgamated && make -C test mg_prefix
5353
macos:
5454
runs-on: macos-latest
5555
strategy:
@@ -66,7 +66,7 @@ jobs:
6666
with: { fetch-depth: 2 }
6767
- run: if ./test/match_changed_files.sh '^test|^src/.*.[ch]' ; then echo GO=1 >> $GITHUB_ENV ; fi
6868
- if: ${{ env.GO == 1 }}
69-
run: make test ASAN_OPTIONS=
69+
run: make -C test test ASAN_OPTIONS=
7070
windows:
7171
runs-on: ubuntu-latest
7272
strategy:
@@ -79,24 +79,24 @@ jobs:
7979
with: { fetch-depth: 2 }
8080
- run: if ./test/match_changed_files.sh '^test|^src/.*.[ch]' ; then echo GO=1 >> $GITHUB_ENV ; fi
8181
- if: ${{ env.GO == 1 }}
82-
run: make ${{ matrix.target }}
82+
run: make -C test ${{ matrix.target }}
8383
arm:
8484
runs-on: ubuntu-latest
8585
steps:
8686
- uses: actions/checkout@v4
87-
- run: make arm
87+
- run: make -C test arm
8888
riscv:
8989
runs-on: ubuntu-latest
9090
steps:
9191
- uses: actions/checkout@v4
92-
- run: make riscv
92+
- run: make -C test riscv
9393

9494
examples:
9595
runs-on: ubuntu-latest
9696
steps:
9797
- uses: actions/checkout@v4
98-
- run: make examples_essential
99-
- run: make clean_examples_essential
98+
- run: make -C test examples_essential
99+
- run: make -C test clean_examples_essential
100100
examples_win:
101101
runs-on: windows-latest
102102
steps:
@@ -105,18 +105,18 @@ jobs:
105105
# with:
106106
# platform: x64
107107
- name: test they build
108-
run: make examples_win
108+
run: make -C test examples_win
109109
shell: cmd
110110
- name: test they clean
111-
run: make clean_examples_win
111+
run: make -C test clean_examples_win
112112
shell: cmd
113113
examples_mac:
114114
runs-on: macos-latest
115115
env: { HOMEBREW_NO_AUTO_UPDATE: 1 }
116116
steps:
117117
- uses: actions/checkout@v4
118-
- run: make examples_mac
119-
- run: make clean_examples_mac
118+
- run: make -C test examples_mac
119+
- run: make -C test clean_examples_mac
120120

121121

122122
generic_examples:

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: original workflow, updated
1+
name: original workflow, outdated # *** YES, OUTDATED *** kept for hystorical/reference purposes, attachment, etc.
22
on:
33
workflow_dispatch:
44
env:

0 commit comments

Comments
 (0)