From 427dd2cab833a95a4a50d4e3f39b192e2fa91311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Tue, 16 Apr 2024 20:47:54 +0900 Subject: [PATCH] fix: test --- .github/workflows/release.yml | 6 ------ .github/workflows/test.yml | 13 ++++--------- Makefile | 2 +- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee9aedf..8008a9b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,17 +18,11 @@ jobs: id: checkout uses: actions/checkout@v4 - - name: Setup Build Tools - run: | - sudo apt-get update - sudo apt-get install -y gcc make - - name: Setup NDK uses: nttld/setup-ndk@v1 id: setup-ndk with: ndk-version: r26d - local-cache: true - name: Setup Go Environment uses: actions/setup-go@master diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d495213..115c42f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,11 +10,6 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 - - name: Setup Build Tools - run: | - sudo apt-get update - sudo apt-get install -y gcc make - - name: Setup NDK uses: nttld/setup-ndk@v1 id: setup-ndk @@ -38,9 +33,6 @@ jobs: BUILD_MACHINE: linux run: | echo NDK path is $NDK_HOME - ls -hl $NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/clang - ls -hl /opt/hostedtoolcache - $NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android23-clang --version make -e - name: Build and Run Tests @@ -48,4 +40,7 @@ jobs: NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} BUILD_MACHINE: linux GOARCH: amd64 - run: make -e runtest + run: | + make -e test + ls build + make -e runtest diff --git a/Makefile b/Makefile index 6b71688..60881b4 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ runtest: @if [ ! -f "$(BUILD_PATH)/test" ]; then \ $(MAKE) -e test; \ fi - TEST_OUTPUT=$$(cd $(BUILD_PATH) && ./test | head -c 12); \ + @TEST_OUTPUT=$$(cd $(BUILD_PATH) && ./test | head -c 12); \ if [ $$TEST_OUTPUT = $(TEST_EXPECTED) ]; then \ echo "test succeeded."; \ else \