Skip to content
Snippets Groups Projects
Commit 09230608 authored by Mael Madon's avatar Mael Madon
Browse files

fix testsuite and pipeline

parent 4a70f7e1
No related branches found
No related tags found
No related merge requests found
Pipeline #504 failed
...@@ -21,6 +21,8 @@ let ...@@ -21,6 +21,8 @@ let
"^src/.*\.?pp" "^src/.*\.?pp"
"^src/algo" "^src/algo"
"^src/algo/.*\.?pp" "^src/algo/.*\.?pp"
"^src/algo_perso"
"^src/algo_perso/.*\.?pp"
"^src/external" "^src/external"
"^src/external/.*\.?pp" "^src/external/.*\.?pp"
"^meson\.build" "^meson\.build"
...@@ -34,10 +36,10 @@ let ...@@ -34,10 +36,10 @@ let
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
dontStrip = true; dontStrip = true;
# Keep files generated by GCOV, so depending jobs can use them. # Keep files generated by GCOV, so depending jobs can use them.
postInstall = pkgs.lib.optionalString doCoverage '' # postInstall = pkgs.lib.optionalString doCoverage ''
mkdir -p $out/gcno # mkdir -p $out/gcno
cp batsched@exe/*.gcno $out/gcno/ # cp batsched@exe/*.gcno $out/gcno/
''; # '';
}); });
# Batsched integration tests. # Batsched integration tests.
......
...@@ -34,10 +34,10 @@ let ...@@ -34,10 +34,10 @@ let
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
dontStrip = true; dontStrip = true;
# Keep files generated by GCOV, so depending jobs can use them. # Keep files generated by GCOV, so depending jobs can use them.
postInstall = pkgs.lib.optionalString doCoverage '' # postInstall = pkgs.lib.optionalString doCoverage ''
mkdir -p $out/gcno # mkdir -p $out/gcno
cp batsched@exe/*.gcno $out/gcno/ # cp batsched@exe/*.gcno $out/gcno/
''; # '';
}); });
# Batsched integration tests. # Batsched integration tests.
......
...@@ -10,14 +10,14 @@ Platform = namedtuple('Platform', ['name', 'filename']) ...@@ -10,14 +10,14 @@ Platform = namedtuple('Platform', ['name', 'filename'])
def pytest_generate_tests(metafunc): def pytest_generate_tests(metafunc):
if 'platform' in metafunc.fixturenames: if 'platform' in metafunc.fixturenames:
platform_files = glob.glob('platforms/*.xml') platform_files = glob.glob('test/platforms/*.xml')
platforms = [Platform( platforms = [Platform(
name=basename(platform_file).replace('.xml', ''), name=basename(platform_file).replace('.xml', ''),
filename=abspath(platform_file)) for platform_file in platform_files] filename=abspath(platform_file)) for platform_file in platform_files]
metafunc.parametrize('platform', platforms) metafunc.parametrize('platform', platforms)
if 'workload' in metafunc.fixturenames: if 'workload' in metafunc.fixturenames:
workload_files = glob.glob('workloads/*.json') workload_files = glob.glob('test/workloads/*.json')
workloads = [Workload( workloads = [Workload(
name=basename(workload_file).replace('.json', ''), name=basename(workload_file).replace('.json', ''),
filename=abspath(workload_file)) for workload_file in workload_files] filename=abspath(workload_file)) for workload_file in workload_files]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment