Skip to content

Commit 57b8536

Browse files
committed
Fix CI
1 parent 8d0eb73 commit 57b8536

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

build_test_all.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,
4444

4545
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test
4646
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_cpp20
47-
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_cpp23
4847
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_cpp20_no_sourcelocation
48+
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_cpp23
4949
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_fast
5050
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_slow
5151
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_module_lock_custom

run_tests.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ if "%target_configuration%"=="" set target_configuration=Debug
1010

1111
call :run_test test
1212
call :run_test test_cpp20
13-
call :run_test test_cpp23
1413
call :run_test test_cpp20_no_sourcelocation
14+
call :run_test test_cpp23
1515
call :run_test test_fast
1616
call :run_test test_slow
1717
call :run_test test_old

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ set(SKIP_LARGE_PCH FALSE CACHE BOOL "Skip building large precompiled headers.")
106106

107107
add_subdirectory(test)
108108
add_subdirectory(test_cpp20)
109-
add_subdirectory(test_cpp23)
110109
add_subdirectory(test_cpp20_no_sourcelocation)
110+
add_subdirectory(test_cpp23)
111111

112112
if(HAS_WINDOWSNUMERICS)
113113
add_subdirectory(old_tests)

test/test_cpp23/delegate_deducing_this.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,7 @@ TEST_CASE("typedeventhandler")
9797
// Clang 20 target x86 generates incorrect code for this test.
9898
// In observed_sender ctor (#1), this = X; in assignment operator (#2), this = X+2 (bytes).
9999
// FIXME: Enable the test after Clang is fixed
100-
TEST_CASE("observablevector_vectorchanged", "[.clang-crash]")
101-
#else
102100
TEST_CASE("observablevector_vectorchanged")
103-
#endif
104101
{
105102
IObservableVector<int> vector = single_threaded_observable_vector<int>();
106103

@@ -128,3 +125,5 @@ TEST_CASE("observablevector_vectorchanged")
128125
}
129126

130127
#endif
128+
129+
#endif

0 commit comments

Comments
 (0)