From 092306082dacebf9cc41e0a4ed2d210d266969ed Mon Sep 17 00:00:00 2001 From: Mael Madon <mael.madon@irit.fr> Date: Tue, 28 Sep 2021 13:47:11 +0200 Subject: [PATCH] fix testsuite and pipeline --- default.nix | 10 ++++++---- release.nix | 8 ++++---- test/conftest.py | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/default.nix b/default.nix index 4a4a883..1537f89 100644 --- a/default.nix +++ b/default.nix @@ -21,6 +21,8 @@ let "^src/.*\.?pp" "^src/algo" "^src/algo/.*\.?pp" + "^src/algo_perso" + "^src/algo_perso/.*\.?pp" "^src/external" "^src/external/.*\.?pp" "^meson\.build" @@ -34,10 +36,10 @@ let hardeningDisable = [ "all" ]; dontStrip = true; # Keep files generated by GCOV, so depending jobs can use them. - postInstall = pkgs.lib.optionalString doCoverage '' - mkdir -p $out/gcno - cp batsched@exe/*.gcno $out/gcno/ - ''; + # postInstall = pkgs.lib.optionalString doCoverage '' + # mkdir -p $out/gcno + # cp batsched@exe/*.gcno $out/gcno/ + # ''; }); # Batsched integration tests. diff --git a/release.nix b/release.nix index 4a4a883..0fdd1b1 100644 --- a/release.nix +++ b/release.nix @@ -34,10 +34,10 @@ let hardeningDisable = [ "all" ]; dontStrip = true; # Keep files generated by GCOV, so depending jobs can use them. - postInstall = pkgs.lib.optionalString doCoverage '' - mkdir -p $out/gcno - cp batsched@exe/*.gcno $out/gcno/ - ''; + # postInstall = pkgs.lib.optionalString doCoverage '' + # mkdir -p $out/gcno + # cp batsched@exe/*.gcno $out/gcno/ + # ''; }); # Batsched integration tests. diff --git a/test/conftest.py b/test/conftest.py index 7ffdfe8..61ada0a 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -10,14 +10,14 @@ Platform = namedtuple('Platform', ['name', 'filename']) def pytest_generate_tests(metafunc): if 'platform' in metafunc.fixturenames: - platform_files = glob.glob('platforms/*.xml') + platform_files = glob.glob('test/platforms/*.xml') platforms = [Platform( name=basename(platform_file).replace('.xml', ''), filename=abspath(platform_file)) for platform_file in platform_files] metafunc.parametrize('platform', platforms) if 'workload' in metafunc.fixturenames: - workload_files = glob.glob('workloads/*.json') + workload_files = glob.glob('test/workloads/*.json') workloads = [Workload( name=basename(workload_file).replace('.json', ''), filename=abspath(workload_file)) for workload_file in workload_files] -- GitLab