From c3866bb7b19542e61a0324c5f5c3822b77c47de9 Mon Sep 17 00:00:00 2001 From: Joe Conigliaro Date: Wed, 29 Jun 2022 21:11:28 +1000 Subject: [PATCH] gen.golang: skip tests only on ubuntu-docker-musl --- .github/workflows/ci.yml | 3 --- cmd/tools/vtest-self.v | 1 - vlib/v/gen/golang/tests/golang_test.v | 8 ++++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1be6279d99..a2efc705cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,6 @@ jobs: sudo apt-get update sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev - sudo apt-get install --quiet -y golang-go ## The following is needed for examples/wkhtmltopdf.v wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb sudo apt-get install --quiet -y xfonts-75dpi xfonts-base @@ -85,8 +84,6 @@ jobs: run: ./v tutorials/building_a_simple_web_blog_with_vweb/code/blog - name: Build cmd/tools/fast run: cd cmd/tools/fast && ../../../v fast.v && ./fast - - name: Test Go backend - run: ./v vlib/v/gen/golang/tests/golang_test.v - name: V self compilation with -usecache run: | unset VFLAGS diff --git a/cmd/tools/vtest-self.v b/cmd/tools/vtest-self.v index 2f7fa32c7d..dd720e3c6b 100644 --- a/cmd/tools/vtest-self.v +++ b/cmd/tools/vtest-self.v @@ -90,7 +90,6 @@ const ( 'vlib/context/deadline_test.v' /* sometimes blocks */, 'vlib/mysql/mysql_orm_test.v' /* mysql not installed */, 'vlib/pg/pg_orm_test.v' /* pg not installed */, - 'vlib/v/gen/golang/tests/golang_test.v' /* we will manually run this on only ubuntu-tcc for now */, ] skip_fsanitize_too_slow = [ // These tests are too slow to be run in the CI on each PR/commit diff --git a/vlib/v/gen/golang/tests/golang_test.v b/vlib/v/gen/golang/tests/golang_test.v index 7cec75a2ca..7ac9051ccc 100644 --- a/vlib/v/gen/golang/tests/golang_test.v +++ b/vlib/v/gen/golang/tests/golang_test.v @@ -2,12 +2,16 @@ import os import benchmark import term +const github_job = os.getenv('GITHUB_JOB') + const is_verbose = os.getenv('VTEST_SHOW_CMD') != '' // TODO some logic copy pasted from valgrind_test.v and compiler_test.v, move to a module fn test_golang() { - $if arm64 { - return + // this was failing on ubuntu-docker-musl, skip it for now + if testing.github_job == 'ubuntu-docker-musl' { + eprintln('Skipping Go tests') + exit(0) } mut bench := benchmark.new_benchmark() vexe := os.getenv('VEXE')