@@ -1186,7 +1186,7 @@ def test_release_eigen_exact(self):
11861186 self.assertNotIn('dpkg-query', install)
11871187 # The ARM configure consumes exactly the system Eigen the ARM step asserted.
11881188 for line in (" if: matrix.triple == 'linux-aarch64'",
1189- ' -DEigen3_DIR=/usr/share/eigen3/cmake \\',
1189+ ' -DEigen3_DIR:PATH =/usr/share/eigen3/cmake \\',
11901190 ' -DFETCHCONTENT_FULLY_DISCONNECTED=ON \\',
11911191 " grep -Fx 'Eigen3_DIR:PATH=/usr/share/eigen3/cmake' build/CMakeCache.txt"):
11921192 self.assertIn(line, ci_preflight._code(configure))
@@ -1253,8 +1253,10 @@ def test_release_eigen_exact(self):
12531253 (arm_name, arm_name, 'Assert Eigen3 3.4.0 on arm64', False),
12541254 (arm_name, arm, '', False),
12551255 # Configure: the Eigen directory, the cache proof and offline FetchContent.
1256- (configure_name, '-DEigen3_DIR=/usr/share/eigen3/cmake',
1257- '-DEigen3_DIR=/other/eigen', False),
1256+ (configure_name, '-DEigen3_DIR:PATH=/usr/share/eigen3/cmake',
1257+ '-DEigen3_DIR:PATH=/other/eigen', False),
1258+ (configure_name, '-DEigen3_DIR:PATH=/usr/share/eigen3/cmake',
1259+ '-DEigen3_DIR=/usr/share/eigen3/cmake', False),
12581260 (configure_name,
12591261 "grep -Fx 'Eigen3_DIR:PATH=/usr/share/eigen3/cmake' build/CMakeCache.txt",
12601262 'true', False),
@@ -12821,10 +12823,10 @@ def setUp(self):
1282112823 announce_compare_fixture_paths(fixture, legacy, gke_fixture, release)
1282212824 split_bytes = fixture.read_bytes()
1282312825 self.assertEqual(hashlib.sha256(split_bytes).hexdigest(),
12824- '00e84f8d45028105c580ac84818ccdd96ff08aeab352286273a29a02eaeed062 ')
12826+ '0c782f0b663c83fcd0ea47646ba3f4f24a87d59b94cde51d95bb95407218b310 ')
1282512827 legacy_bytes = legacy.read_bytes()
1282612828 self.assertEqual(hashlib.sha256(legacy_bytes).hexdigest(),
12827- '3f6443192ad993e59e543b85ef00ebca226dba4a2e4c2647a02ac371daa2b267 ')
12829+ '9572e9f99ef22b7d4aa21fcab2009deb812f00b682d65184c867b4d768e47eee ')
1282812830 gke_bytes = gke_fixture.read_bytes()
1282912831 self.assertEqual(hashlib.sha256(gke_bytes).hexdigest(),
1283012832 '21025075090a0a40bfd7360e54a36a0c9bbac9bb8109fbbaa86edce347c27b87')
@@ -12853,20 +12855,25 @@ def assert_refused(self, changed, finding):
1285312855 self.assertIn(finding, main_admission_data_findings(
1285412856 {'gke-pr.yml': self.gke, 'release.yml': changed}))
1285512857
12856- def test_typed_eigen_dir_flag_is_admitted_in_both_layouts (self):
12858+ def test_only_the_typed_eigen_dir_flag_is_admitted_in_both_layouts (self):
1285712859 # The untyped flag leaves Eigen3_DIR UNINITIALIZED in the cache, so the
12858- # reviewed grep for Eigen3_DIR:PATH fails; the typed flag is admitted.
12860+ # reviewed grep for Eigen3_DIR:PATH fails: only the typed flag is admitted.
1285912861 untyped = ci_preflight.EIGEN_DIR_UNTYPED
1286012862 typed = ci_preflight.EIGEN_DIR_TYPED
1286112863 for workflow in (self.split, self.legacy):
12862- changed = workflow.replace(untyped, typed)
1286312864 with self.subTest(jobs=tuple(_jobs(workflow))):
12864- self.assertNotEqual(changed , workflow)
12865- self.assertEqual(ci_preflight.release_prebuilt_workflow_findings(changed ), [])
12866- self.assertEqual(ci_preflight.runner_findings({'release.yml': changed }), [])
12865+ self.assertIn(typed , workflow)
12866+ self.assertEqual(ci_preflight.release_prebuilt_workflow_findings(workflow ), [])
12867+ self.assertEqual(ci_preflight.runner_findings({'release.yml': workflow }), [])
1286712868 self.assertEqual(main_admission_data_findings(
12868- {'gke-pr.yml': self.gke, 'release.yml': changed}), [])
12869- moved = self.split.replace(untyped, '-DEigen3_DIR:PATH=/outside')
12869+ {'gke-pr.yml': self.gke, 'release.yml': workflow}), [])
12870+ reverted = workflow.replace(typed, untyped)
12871+ self.assertNotEqual(reverted, workflow)
12872+ self.assertTrue(ci_preflight.release_prebuilt_workflow_findings(reverted))
12873+ self.assertTrue(ci_preflight.runner_findings({'release.yml': reverted}))
12874+ self.assertTrue(main_admission_data_findings(
12875+ {'gke-pr.yml': self.gke, 'release.yml': reverted}))
12876+ moved = self.split.replace(typed, '-DEigen3_DIR:PATH=/outside')
1287012877 self.assertTrue(ci_preflight.release_prebuilt_workflow_findings(moved))
1287112878
1287212879 def test_legacy_and_split_layouts_dispatch_through_real_parsers(self):
@@ -13167,7 +13174,7 @@ def test_arm_eigen_configure_build_install_and_archive_steps_stay_applicable(sel
1316713174 ('Install Eigen3 (Linux)', 'sudo apt-get install -y libeigen3-dev', 'true'),
1316813175 ('Assert Eigen3 3.4.0 on ARM', 'EIGEN_MAJOR_VERSION[[:space:]]+4',
1316913176 'EIGEN_MAJOR_VERSION[[:space:]]+3'),
13170- ('Configure', '-DEigen3_DIR=/usr/share/eigen3/cmake', '-DEigen3_DIR=/outside'),
13177+ ('Configure', '-DEigen3_DIR:PATH =/usr/share/eigen3/cmake', '-DEigen3_DIR:PATH =/outside'),
1317113178 ('Configure', '-DFETCHCONTENT_FULLY_DISCONNECTED=ON', '-DFETCHCONTENT_FULLY_DISCONNECTED=OFF'),
1317213179 ('Build', 'cmake --build build -j 4', 'true'),
1317313180 ('Install to staging', 'cmake --install build', 'true'),
0 commit comments