Fix FileArbDevOpsPythonTests/BuildAndInstallCPlusPlusProgramTests.py

NeilJustice · Jan 8, 2025 · 30acc35 · 30acc35
1 parent 4d23ed4
commit 30acc35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/FileArbDevOpsPythonTests/BuildAndInstallCPlusPlusProgramTests.py b/FileArbDevOpsPythonTests/BuildAndInstallCPlusPlusProgramTests.py
@@ -74,7 +74,7 @@ def test_linux_cmake_build_test_install__RunCMakeThenRunsNinja(self, _1, _2, _3,
       BuildAndInstallCPlusPlusProgram.linux_cmake_build_test_install(
          self.cmakeBuildType, self.testsProjectName, self.cmakeDefinitions, doInstallProgram)
       #
-      CMake.generate.assert_called_once_with(self.cmakeBuildType, self.cmakeBuildType, self.cmakeDefinitions, '..')
+      CMake.generate.assert_called_once_with(self.cmakeBuildType, 'Ninja', self.cmakeBuildType, self.cmakeDefinitions, '..')
       expectedZenUnitTestsProgramCommand = f'{self.testsProjectName}/{self.testsProjectName} --test-runs=2 --random --max-test-milliseconds=200 --exit-1-if-tests-skipped'
       self.assertEqual(2, len(Process.fail_fast_run.call_args_list))
       Process.fail_fast_run.assert_has_calls([
@@ -92,7 +92,7 @@ def test_windows_cmake_build_test_install__RunsCMakeThenRunsMSBuild(self, _1, _2
       BuildAndInstallCPlusPlusProgram.windows_cmake_build_test_install(
          self.solutionName, self.cmakeBuildType, self.testsProjectName, self.cmakeDefinitions, doInstallProgram)
       #
-      CMake.generate.assert_called_once_with('.', self.cmakeBuildType, self.cmakeDefinitions, '.')
+      CMake.generate.assert_called_once_with('.', 'Visual Studio 17 2022', self.cmakeBuildType, self.cmakeDefinitions, '.')
       expectedMSBuildCommand = f'MSBuild.exe {self.solutionName}.sln /p:Configuration={self.cmakeBuildType} /p:Platform=x64 /m'
       expectedZenUnitTestsProgramCommand = f'{self.testsProjectName}/{self.cmakeBuildType}/{self.testsProjectName}.exe --test-runs=2 --random --max-test-milliseconds=200 --exit-1-if-tests-skipped'
       self.assertEqual(2, len(Process.fail_fast_run.call_args_list))

diff --git a/githooks/pre-commit b/githooks/pre-commit
@@ -4,11 +4,11 @@ set -eu
 osname="$(uname --operating-system)"
 if [[ "$osname" == *"Linux" ]]; then
    ./JenkinsJobs/Linux/FileArb-Cppcheck.sh
-   ./JenkinsJobs/Linux/FileArb-DevOpsPython-Mypy-Flake8-Pylint.sh
+   ./JenkinsJobs/Linux/FileArb-DevOpsPython.sh
    ./JenkinsJobs/Linux/FileArb-Debug-Clang.sh
 elif [ "$osname" == "Msys" ]; then
    pwsh.exe JenkinsJobs/Windows/FileArb-Cppcheck.ps1
-   pwsh.exe JenkinsJobs/Windows/FileArb-DevOpsPython-Mypy-Flake8-Pylint.ps1
+   pwsh.exe JenkinsJobs/Windows/FileArb-DevOpsPython.ps1
    pwsh.exe JenkinsJobs/Windows/FileArb-Debug.ps1 "OFF"
 fi
 jenkinsJobExitCode=$?