From 8ca6a7215e1126c885acbb845c04c98110bd2fd2 Mon Sep 17 00:00:00 2001 From: Vincent Jicquel Date: Thu, 28 Nov 2024 10:06:12 +0100 Subject: [PATCH 1/2] Move aggregated_libraries tests to testsuite/projects/tests The repository has been forgotten during the testsuite refactoring. --- .../tests}/aggregated_libraries/project_iterator/test.adb | 0 .../tests}/aggregated_libraries/project_iterator/test.yaml | 0 .../tests}/aggregated_libraries/project_iterator/tree/agg.gpr | 0 .../tests}/aggregated_libraries/project_iterator/tree/lib1.gpr | 0 .../tests}/aggregated_libraries/project_iterator/tree/lib2.gpr | 0 .../tests}/aggregated_libraries/project_iterator/tree/root.gpr | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename testsuite/{tests/projects => projects/tests}/aggregated_libraries/project_iterator/test.adb (100%) rename testsuite/{tests/projects => projects/tests}/aggregated_libraries/project_iterator/test.yaml (100%) rename testsuite/{tests/projects => projects/tests}/aggregated_libraries/project_iterator/tree/agg.gpr (100%) rename testsuite/{tests/projects => projects/tests}/aggregated_libraries/project_iterator/tree/lib1.gpr (100%) rename testsuite/{tests/projects => projects/tests}/aggregated_libraries/project_iterator/tree/lib2.gpr (100%) rename testsuite/{tests/projects => projects/tests}/aggregated_libraries/project_iterator/tree/root.gpr (100%) diff --git a/testsuite/tests/projects/aggregated_libraries/project_iterator/test.adb b/testsuite/projects/tests/aggregated_libraries/project_iterator/test.adb similarity index 100% rename from testsuite/tests/projects/aggregated_libraries/project_iterator/test.adb rename to testsuite/projects/tests/aggregated_libraries/project_iterator/test.adb diff --git a/testsuite/tests/projects/aggregated_libraries/project_iterator/test.yaml b/testsuite/projects/tests/aggregated_libraries/project_iterator/test.yaml similarity index 100% rename from testsuite/tests/projects/aggregated_libraries/project_iterator/test.yaml rename to testsuite/projects/tests/aggregated_libraries/project_iterator/test.yaml diff --git a/testsuite/tests/projects/aggregated_libraries/project_iterator/tree/agg.gpr b/testsuite/projects/tests/aggregated_libraries/project_iterator/tree/agg.gpr similarity index 100% rename from testsuite/tests/projects/aggregated_libraries/project_iterator/tree/agg.gpr rename to testsuite/projects/tests/aggregated_libraries/project_iterator/tree/agg.gpr diff --git a/testsuite/tests/projects/aggregated_libraries/project_iterator/tree/lib1.gpr b/testsuite/projects/tests/aggregated_libraries/project_iterator/tree/lib1.gpr similarity index 100% rename from testsuite/tests/projects/aggregated_libraries/project_iterator/tree/lib1.gpr rename to testsuite/projects/tests/aggregated_libraries/project_iterator/tree/lib1.gpr diff --git a/testsuite/tests/projects/aggregated_libraries/project_iterator/tree/lib2.gpr b/testsuite/projects/tests/aggregated_libraries/project_iterator/tree/lib2.gpr similarity index 100% rename from testsuite/tests/projects/aggregated_libraries/project_iterator/tree/lib2.gpr rename to testsuite/projects/tests/aggregated_libraries/project_iterator/tree/lib2.gpr diff --git a/testsuite/tests/projects/aggregated_libraries/project_iterator/tree/root.gpr b/testsuite/projects/tests/aggregated_libraries/project_iterator/tree/root.gpr similarity index 100% rename from testsuite/tests/projects/aggregated_libraries/project_iterator/tree/root.gpr rename to testsuite/projects/tests/aggregated_libraries/project_iterator/tree/root.gpr From c95ffe71f75b8df665a5b2cadf9645e01ba98cc6 Mon Sep 17 00:00:00 2001 From: Vincent Jicquel Date: Thu, 28 Nov 2024 10:07:32 +0100 Subject: [PATCH 2/2] Skip the aggregated_libraries projects tests for cross environment --- .../tests/aggregated_libraries/project_iterator/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testsuite/projects/tests/aggregated_libraries/project_iterator/test.yaml b/testsuite/projects/tests/aggregated_libraries/project_iterator/test.yaml index 345d652c..46e7a55d 100644 --- a/testsuite/projects/tests/aggregated_libraries/project_iterator/test.yaml +++ b/testsuite/projects/tests/aggregated_libraries/project_iterator/test.yaml @@ -2,3 +2,5 @@ description: Check aggregated libraries project iteration. data: - "tree" - "test.adb" +control: + - [SKIP, "env.is_cross", "Libutil missing from cross-linux sysroots, see T616-039"]