Skip to content

Commit e1ca798

Browse files
committed
test: Migrate to Frida's releng infrastructure
1 parent a2a3c2e commit e1ca798

15 files changed

+105
-266
lines changed

.github/env/bootstrap.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/env/emit-linux-arm64.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/env/emit-linux-armhf.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/env/emit-linux-x86.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/env/emit-linux-x86_64.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/env/emit-macos-x86_64.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 15 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- main
1010

1111
env:
12-
MESON_VERSION: 1.0.0
12+
GUM_OPTIONS: '-Dfrida-gum:gumjs=enabled'
1313

1414
jobs:
1515
windows:
@@ -21,8 +21,6 @@ jobs:
2121
steps:
2222
- name: Check out repo
2323
uses: actions/checkout@v3
24-
- name: Install dependencies
25-
run: pip install meson==${{ env.MESON_VERSION }} ninja
2624
- name: Environment
2725
uses: ilammy/msvc-dev-cmd@v1
2826
with:
@@ -32,11 +30,8 @@ jobs:
3230
npm install
3331
cd test
3432
npm install
35-
meson setup `
36-
--default-library static `
37-
--force-fallback-for=zlib `
38-
build
39-
meson compile -C build
33+
.\configure -- ${{ env.GUM_OPTIONS }}
34+
.\make
4035
- name: Test
4136
run: .\test\build\frida-fs-tests.exe
4237

@@ -45,18 +40,13 @@ jobs:
4540
steps:
4641
- name: Check out repo
4742
uses: actions/checkout@v3
48-
- name: Install dependencies
49-
run: pip3 install meson==${{ env.MESON_VERSION }} ninja
5043
- name: Build
5144
run: |
5245
npm install
5346
cd test
5447
npm install
55-
meson setup \
56-
--default-library static \
57-
--force-fallback-for=glib \
58-
build
59-
meson compile -C build
48+
./configure -- ${{ env.GUM_OPTIONS }}
49+
make
6050
- name: Test
6151
run: ./test/build/frida-fs-tests
6252

@@ -68,21 +58,15 @@ jobs:
6858
- name: Install dependencies
6959
run: |
7060
sudo apt-get update
71-
sudo apt-get install gcc-multilib lib32stdc++-11-dev
72-
pip install meson==${{ env.MESON_VERSION }}
73-
.github/env/bootstrap.sh linux-x86_64 linux-x86
61+
sudo apt-get install gcc-multilib lib32stdc++-13-dev
7462
- name: Build
7563
run: |
7664
npm install
7765
cd test
7866
npm install
79-
export PATH="/tmp/toolchain/bin:$PATH"
80-
meson setup \
81-
--native-file /tmp/native.txt \
82-
--cross-file /tmp/cross.txt \
83-
--default-library static \
84-
build
85-
meson compile -C build
67+
CC="gcc -m32" CXX="g++ -m32" STRIP="strip" \
68+
./configure --build=linux-x86 --host=linux-x86 -- ${{ env.GUM_OPTIONS }}
69+
make
8670
- name: Test
8771
run: ./test/build/frida-fs-tests
8872

@@ -91,18 +75,13 @@ jobs:
9175
steps:
9276
- name: Check out repo
9377
uses: actions/checkout@v3
94-
- name: Install dependencies
95-
run: pip install meson==${{ env.MESON_VERSION }} ninja
9678
- name: Build
9779
run: |
9880
npm install
9981
cd test
10082
npm install
101-
meson setup \
102-
--default-library static \
103-
--force-fallback-for=glib \
104-
build
105-
meson compile -C build
83+
./configure -- ${{ env.GUM_OPTIONS }}
84+
make
10685
- name: Test
10786
run: ./test/build/frida-fs-tests
10887

@@ -115,20 +94,13 @@ jobs:
11594
run: |
11695
sudo apt-get update
11796
sudo apt-get install g++-arm-linux-gnueabihf qemu-user
118-
pip install meson==${{ env.MESON_VERSION }}
119-
.github/env/bootstrap.sh linux-x86_64 linux-armhf
12097
- name: Build
12198
run: |
12299
npm install
123100
cd test
124101
npm install
125-
export PATH="/tmp/toolchain/bin:$PATH"
126-
meson setup \
127-
--native-file /tmp/native.txt \
128-
--cross-file /tmp/cross.txt \
129-
--default-library static \
130-
build
131-
meson compile -C build
102+
./configure --host=arm-linux-gnueabihf -- ${{ env.GUM_OPTIONS }}
103+
make
132104
- name: Test
133105
run: qemu-arm -L /usr/arm-linux-gnueabihf ./test/build/frida-fs-tests
134106

@@ -141,19 +113,12 @@ jobs:
141113
run: |
142114
sudo apt-get update
143115
sudo apt-get install g++-aarch64-linux-gnu qemu-user
144-
pip install meson==${{ env.MESON_VERSION }}
145-
.github/env/bootstrap.sh linux-x86_64 linux-arm64
146116
- name: Build
147117
run: |
148118
npm install
149119
cd test
150120
npm install
151-
export PATH="/tmp/toolchain/bin:$PATH"
152-
meson setup \
153-
--native-file /tmp/native.txt \
154-
--cross-file /tmp/cross.txt \
155-
--default-library static \
156-
build
157-
meson compile -C build
121+
./configure --host=aarch64-linux-gnu -- ${{ env.GUM_OPTIONS }}
122+
make
158123
- name: Test
159124
run: qemu-aarch64 -L /usr/aarch64-linux-gnu ./test/build/frida-fs-tests

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
/node_modules/
33
/npm-debug.log
44
/test/build/
5+
/test/deps/
56
/test/node_modules/
67
/test/subprojects/

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "test/releng"]
2+
path = test/releng
3+
url = https://github.com/frida/releng.git

test/BSDmakefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
all: .DEFAULT
2+
3+
.DEFAULT:
4+
@gmake ${.MAKEFLAGS} ${.TARGETS}
5+
6+
.PHONY: all

0 commit comments

Comments
 (0)