Skip to content

Commit 1121744

Browse files
build: aarch64 support in linux test runner
1 parent 4db6fce commit 1121744

2 files changed

Lines changed: 18 additions & 7 deletions

File tree

Tests.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ CC=clang
77
CXX=clang++
88

99
ORIGIN=$(shell pwd)
10-
STATIC_DEPS:=$(ORIGIN)/static-deps
11-
STATIC_ROOT:=$(STATIC_DEPS)/lib-x86-64
10+
STATIC_DEPS?=$(ORIGIN)/static-deps/lib-x86-64
11+
STATIC_ROOT:=$(STATIC_DEPS)
1212
INCLUDE=-I external/googletest/googletest \
1313
-I external/googletest/googletest/include \
1414
-I external/googletest/googlemock/include \

scripts/test.sh

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,30 @@
33
shopt -s extglob
44

55
ORIGIN=$PWD
6-
STATIC_DEPS=$ORIGIN/static-deps/lib-x86-64/lib
6+
7+
ARCH=$(uname -m)
8+
9+
if [[ "$ARCH" == "x86_64" ]]; then
10+
STATIC_DEPS=$ORIGIN/static-deps/lib-x86-64
11+
elif [[ "$ARCH" == "arm64" || "$ARCH" == "aarch64" ]]; then
12+
STATIC_DEPS=$ORIGIN/static-deps/lib-aarch64
13+
else
14+
echo "Unsupported arch: $ARCH"
15+
exit 1
16+
fi
17+
718
BUILD=testbuild
819

9-
BAKDIR=$STATIC_DEPS/bak
20+
BAKDIR=$STATIC_DEPS/lib/bak
1021
mkdir -p $BAKDIR
11-
mv -v $STATIC_DEPS/*c++*.so* $BAKDIR/
22+
mv -v $STATIC_DEPS/lib/*c++*.so* $BAKDIR/
1223

1324
export DDB_TEST_SUITES=${@}
1425
mkdir -p $BUILD
1526
export LD_LIBRARY_PATH=$STATIC_DEPS
16-
make V=1 -j --file=Tests.mk
27+
make V=1 -j --file=Tests.mk STATIC_DEPS=$STATIC_DEPS
1728
code=$?
1829

19-
mv -v $BAKDIR/*c++*.so* $STATIC_DEPS/
30+
mv -v $BAKDIR/*c++*.so* $STATIC_DEPS/lib
2031

2132
exit $code

0 commit comments

Comments
 (0)