From 7c9c42fad66d9ba784fd34c643a28efa612cdee9 Mon Sep 17 00:00:00 2001 From: Borislav Stanimirov Date: Wed, 12 Jan 2022 08:17:58 +0200 Subject: [PATCH] Allow relative integration test dir from env --- .github/workflows/test.yml | 2 +- test/integration/lib.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 425fb54..0ab433a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,4 +27,4 @@ jobs: - name: integration tests run: ruby test/integration/runner.rb env: - CPM_INTEGRATION_TEST_DIR: ${{ env.GITHUB_WORKSPACE }}/build/integration + CPM_INTEGRATION_TEST_DIR: ./build/integration diff --git a/test/integration/lib.rb b/test/integration/lib.rb index bb28ed4..63c81e8 100644 --- a/test/integration/lib.rb +++ b/test/integration/lib.rb @@ -4,7 +4,7 @@ require 'tmpdir' require 'test/unit' module TestLib - TMP_DIR = ENV['CPM_INTEGRATION_TEST_DIR'] || File.join(Dir.tmpdir, 'cpm-test', Time.now.strftime('%Y_%m_%d-%H_%M_%S')) + TMP_DIR = File.expand_path(ENV['CPM_INTEGRATION_TEST_DIR'] || File.join(Dir.tmpdir, 'cpm-test', Time.now.strftime('%Y_%m_%d-%H_%M_%S'))) CPM_PATH = File.expand_path('../../cmake/CPM.cmake', __dir__) TEMPLATES_DIR = File.expand_path('templates', __dir__)