Skip to content

Commit 3418726

Browse files
committed
Move installability CI test to VS2022.
1 parent dc08ec4 commit 3418726

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

.ci.cmake

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ endif()
2626
ctest_build(TARGET _dl)
2727
ctest_build(TARGET _sl)
2828
set(retval 0)
29-
set(retval_cmake 0)
3029
if(NOT CTEST_DISABLE_TESTING)
3130
# shared_fs_mutex takes too long on CI
3231
# tls_socket_handle is unstable
@@ -35,15 +34,15 @@ if(NOT CTEST_DISABLE_TESTING)
3534
if(WIN32)
3635
# Azure's Windows version doesn't permit unprivileged creation of symbolic links
3736
if(CTEST_CMAKE_GENERATOR MATCHES "Visual Studio 15 2017.*")
38-
ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink|process_handle")
37+
ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink|process_handle")
3938
else()
40-
ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink")
39+
ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink")
4140
endif()
4241
elseif(APPLE)
4342
# Around Feb 2021 the Mac OS CI began failing pipe_handle and I don't have a Mac to diagnose
44-
ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}|pipe_handle")
43+
ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}|pipe_handle")
4544
else()
46-
ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}")
45+
ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}")
4746
endif()
4847
endif()
4948
if(WIN32)
@@ -184,20 +183,18 @@ else()
184183
endif()
185184
set(retval2 0)
186185
set(retval3 0)
187-
set(retval2_cmake 0)
188-
set(retval3_cmake 0)
189186
if(NOT CTEST_DISABLE_TESTING)
190187
if(("$ENV{CXX}" MATCHES "clang") OR ("$ENV{CXX}" MATCHES "g\\+\\+"))
191188
if("$ENV{CXX}" MATCHES "clang")
192189
ctest_build(TARGET _sl-asan)
193190
set(CTEST_CONFIGURATION_TYPE "asan")
194-
ctest_test(RETURN_VALUE retval2 CAPTURE_CMAKE_ERROR retval2_cmake INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
191+
ctest_test(RETURN_VALUE retval2 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
195192
else()
196193
set(retval2 0)
197194
endif()
198195
ctest_build(TARGET _sl-ubsan)
199196
set(CTEST_CONFIGURATION_TYPE "ubsan")
200-
ctest_test(RETURN_VALUE retval3 CAPTURE_CMAKE_ERROR retval3_cmake INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
197+
ctest_test(RETURN_VALUE retval3 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
201198
endif()
202199
merge_junit_results_into_ctest_xml()
203200
endif()
@@ -206,7 +203,7 @@ if(EXISTS "${toupload}")
206203
endif()
207204
ctest_submit()
208205
if(NOT retval EQUAL 0 OR NOT retval2 EQUAL 0 OR NOT retval3 EQUAL 0)
209-
message(FATAL_ERROR "FATAL: Running tests exited with ${retval}-${retval_cmake} ${retval2}-${retval2_cmake} ${retval3}-${retval3_cmake}")
206+
message(FATAL_ERROR "FATAL: Running tests exited with ${retval} ${retval2} ${retval3}")
210207
else()
211-
message(STATUS "SUCCESS: Running tests exited with ${retval}-${retval_cmake} ${retval2}-${retval2_cmake} ${retval3}-${retval3_cmake}")
208+
message(STATUS "SUCCESS: Running tests exited with ${retval} ${retval2} ${retval3}")
212209
endif()

.github/workflows/installability.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [ubuntu-20.04, macos-latest, windows-2019]
18+
os: [ubuntu-20.04, macos-latest, windows-2022]
1919
configuration: [error_code, status_code]
2020
env:
2121
NAME: Install-${{ matrix.os }}-${{ matrix.configuration }}

example/path_view_openat.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ namespace path_view_openat_example
3333
using namespace LLFIO_V2_NAMESPACE::windows_nt_kernel;
3434
using namespace std;
3535

36+
using LLFIO_V2_NAMESPACE::byte;
3637
using LLFIO_V2_NAMESPACE::windows_nt_kernel::IO_STATUS_BLOCK;
3738
using LLFIO_V2_NAMESPACE::windows_nt_kernel::NtCreateFile;
3839
using LLFIO_V2_NAMESPACE::windows_nt_kernel::OBJECT_ATTRIBUTES;
@@ -112,7 +113,7 @@ namespace path_view_openat_example
112113
return CreateFileA(zpath.c_str(), access, share, nullptr, creation,
113114
flags, nullptr);
114115
}
115-
else // char8_t, char16_t, wchar_t
116+
else // char8_t, char16_t, wchar_t
116117
{
117118
// Render to the system wide encoding null terminated
118119
auto zpath = path.render_null_terminated<wchar_t>(path);

include/llfio/revision.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
2-
#define LLFIO_PREVIOUS_COMMIT_REF b2eef9e053c35ca7b8d7678169e578893b03fb9e
3-
#define LLFIO_PREVIOUS_COMMIT_DATE "2024-08-22 12:11:35 +00:00"
4-
#define LLFIO_PREVIOUS_COMMIT_UNIQUE b2eef9e0
2+
#define LLFIO_PREVIOUS_COMMIT_REF dc08ec4b231900c4236a0a6a493b6a30d91ae81a
3+
#define LLFIO_PREVIOUS_COMMIT_DATE "2024-08-22 13:23:33 +00:00"
4+
#define LLFIO_PREVIOUS_COMMIT_UNIQUE dc08ec4b

0 commit comments

Comments
 (0)