From ae171ec28e526bca420cdfd3bea2e362491f0dbd Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Fri, 29 Nov 2019 19:32:07 +0300 Subject: [PATCH] a small "v test v" fix --- .github/workflows/ci.yml | 11 ++++++++++- tools/vtest.v | 16 ++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e264585dc..658465ca6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ on: [push, pull_request] jobs: alpine-docker-musl-gcc: - name: Alpine/musl + name: alpine-musl runs-on: ubuntu-latest steps: @@ -78,6 +78,15 @@ jobs: run: ./v test v + macos-prebuilt: + runs-on: macOS-10.14 + steps: + - name: Download V + run: wget https://github.com/vbinaries/vbinaries/releases/download/latest/v_macos.zip && unzip v_macos.zip && ./v --version + - name: Test V + run: ./v test v + + ubuntu-tcc: runs-on: ubuntu-18.04 steps: diff --git a/tools/vtest.v b/tools/vtest.v index 6721bbbf7b..19d84d5ecc 100644 --- a/tools/vtest.v +++ b/tools/vtest.v @@ -95,7 +95,7 @@ pub fn (ts mut TestSession) test() { } $if tinyc { if file.contains('asm') { continue } - } + } tmpc_filepath := file.replace('.v', '.tmp.c') cmd := '"$ts.vexe" $ts.vargs "$file"' @@ -142,18 +142,22 @@ pub fn v_test_v(args_before_test string){ println('vlib/ is missing, it must be next to the V executable') exit(1) } + /* if !os.file_exists(parent_dir + '/v.v') { println('v.v is missing, it must be next to the V executable') exit(1) } + */ // Make sure v.c can be compiled without warnings $if mac { - os.system('$vexe -o v.c v.v') - if os.system('cc -Werror v.c') != 0 { - println('cc failed to build v.c without warnings') - exit(1) + if os.file_exists('/v.v') { + os.system('$vexe -o v.c v.v') + if os.system('cc -Werror v.c') != 0 { + println('cc failed to build v.c without warnings') + exit(1) + } + println('v.c can be compiled without warnings. This is good :)') } - println('v.c can be compiled without warnings. This is good :)') } // println('Testing...')