diff --git a/default.nix b/default.nix index 4a4a88360b37fc0eb8e2018c32e72268e7adb7e6..1537f89e739e43fb0ad2535ff49f37e3b8b57eea 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 4a4a88360b37fc0eb8e2018c32e72268e7adb7e6..0fdd1b114cc343af60875831da1f89c424f7b25f 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 7ffdfe8b8bb504047e010489a0f6821c119fd18b..61ada0aa1fc2db5559381b2a7bbd158045023ee9 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]