Various fixes for tests/CI (#1206)

microsoft · Oct 17, 2022 · 956c8d2 · 956c8d2
1 parent 3ff6631
commit 956c8d2
Show file tree

Hide file tree

Showing 23 changed files with 140 additions and 74 deletions.
diff --git a/.github/workflows/msvc.yml → .github/workflows/ci.yml b/.github/workflows/msvc.yml → .github/workflows/ci.yml
@@ -1,12 +1,13 @@
-name: MSVC Tests
+name: CI Tests
 on:
   push:
   pull_request:
     branches:
       - master
 
 jobs:
-  test-cppwinrt:
+  test-msvc-cppwinrt:
+    name: 'MSVC: Tests'
     strategy:
       matrix:
         arch: [x86, x64, arm64]
@@ -21,7 +22,7 @@ jobs:
       - name: Test all
         run: |
           $VSDevCmd = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere" -latest -find Common7\tools\VSDevCmd.bat
-          if (!$VSDevCmd) { return 1 }
+          if (!$VSDevCmd) { exit 1 }
           echo "Using VSDevCmd: ${VSDevCmd}"
           cmd /c "${VSDevCmd}" "&" build_test_all.cmd ${{ matrix.arch }} ${{ matrix.config }}
 
@@ -37,30 +38,31 @@ jobs:
         run: |
           if (Test-Path "test_failures.txt") {
             Get-Content "test_failures.txt" | ForEach-Object {
-              Write-Error "error: Test '$_' failed!"
+              echo "::error::Test '$_' failed!"
             }
-            return 1
+            exit 1
           }
           if (!(Test-Path "*_results.txt")) {
-            Write-Error "error: No test output found!"
-            return 1
+            echo "::error::No test output found!"
+            exit 1
           }
 
   build-nuget:
+    name: Build nuget package with MSVC
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
 
       - name: Package
         run: |
           $VSDevCmd = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere" -latest -find Common7\tools\VSDevCmd.bat
-          if (!$VSDevCmd) { return 1 }
+          if (!$VSDevCmd) { exit 1 }
           echo "Using VSDevCmd: ${VSDevCmd}"
           cmd /c "${VSDevCmd}" "&" nuget.exe restore cppwinrt.sln
           cmd /c "${VSDevCmd}" "&" build_nuget.cmd
           if (!(Test-Path "*.nupkg")) {
-            Write-Error "error: Output nuget package not found!"
-            return 1
+            echo "::error::Output nuget package not found!"
+            exit 1
           }
 
       - name: Upload nuget package artifact

diff --git a/test/old_tests/UnitTests/Errors.cpp b/test/old_tests/UnitTests/Errors.cpp
@@ -93,7 +93,7 @@ TEST_CASE("Errors")
     try
     {
         init_apartment(apartment_type::single_threaded);
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_error const & e)
     {
@@ -104,7 +104,7 @@ TEST_CASE("Errors")
     try
     {
         Uri uri(L"BAD");
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_invalid_argument const & e) // catching specific exception type
     {
@@ -115,7 +115,7 @@ TEST_CASE("Errors")
     try
     {
         Uri uri(L"BAD");
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_error const& e)
     {
@@ -128,7 +128,7 @@ TEST_CASE("Errors")
     {
         Errors errors;
         errors.Propagate();
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_invalid_argument const & e) // catching specific exception type
     {
@@ -140,7 +140,7 @@ TEST_CASE("Errors")
     {
         Errors errors;
         errors.Fail(L"Failure message");
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_not_implemented const& e)
     {
@@ -158,7 +158,7 @@ TEST_CASE("Errors")
     {
         Errors errors;
         errors.std_out_of_range();
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_out_of_bounds const& e)
     {
@@ -169,7 +169,7 @@ TEST_CASE("Errors")
     {
         Errors errors;
         errors.std_invalid_argument();
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_invalid_argument const& e)
     {
@@ -180,7 +180,7 @@ TEST_CASE("Errors")
     {
         Errors errors;
         errors.std_exception();
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_error const& e)
     {
@@ -207,7 +207,7 @@ TEST_CASE("Errors")
     try
     {
         check_win32(ERROR_NO_NETWORK);
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_error const& e)
     {
@@ -220,7 +220,7 @@ TEST_CASE("Errors")
     try
     {
         check_nt(STATUS_STACK_OVERFLOW);
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_error const& e)
     {

diff --git a/test/old_tests/UnitTests/array.cpp b/test/old_tests/UnitTests/array.cpp
@@ -344,7 +344,7 @@ TEST_CASE("array,at,throw")
         try
         {
             a.at(3);
-            FAIL(L"Previous line should throw");
+            FAIL("Previous line should throw");
         }
         catch (std::out_of_range const & e)
         {
@@ -357,7 +357,7 @@ TEST_CASE("array,at,throw")
         try
         {
             test_array_ref_at_throw({ 1, 2, 3 });
-            FAIL(L"Previous line should throw");
+            FAIL("Previous line should throw");
         }
         catch (std::out_of_range const & e)
         {
@@ -372,7 +372,7 @@ TEST_CASE("array,at,throw")
         try
         {
             a.at(5);
-            FAIL(L"Previous line should throw");
+            FAIL("Previous line should throw");
         }
         catch (std::out_of_range const & e)
         {

diff --git a/test/old_tests/UnitTests/async.cpp b/test/old_tests/UnitTests/async.cpp
@@ -14,6 +14,12 @@ using namespace std::chrono;
 
 namespace
 {
+#ifdef __cpp_lib_coroutine
+    using std::suspend_never;
+#else
+    using std::experimental::suspend_never;
+#endif
+
     IAsyncAction NoSuspend_IAsyncAction()
     {
         co_await 0s;
@@ -1032,23 +1038,23 @@ namespace
     {
         signal_done d{ go };
         co_await resume_on_signal(go);
-        co_await std::experimental::suspend_never{};
+        co_await suspend_never{};
         REQUIRE(false);
     }
 
     IAsyncActionWithProgress<double> AutoCancel_IAsyncActionWithProgress(HANDLE go)
     {
         signal_done d{ go };
         co_await resume_on_signal(go);
-        co_await std::experimental::suspend_never{};
+        co_await suspend_never{};
         REQUIRE(false);
     }
 
     IAsyncOperation<uint32_t> AutoCancel_IAsyncOperation(HANDLE go)
     {
         signal_done d{ go };
         co_await resume_on_signal(go);
-        co_await std::experimental::suspend_never{};
+        co_await suspend_never{};
         REQUIRE(false);
         co_return 0;
     }
@@ -1057,7 +1063,7 @@ namespace
     {
         signal_done d{ go };
         co_await resume_on_signal(go);
-        co_await std::experimental::suspend_never{};
+        co_await suspend_never{};
         REQUIRE(false);
         co_return 0;
     }

diff --git a/test/old_tests/UnitTests/hresult_error.cpp b/test/old_tests/UnitTests/hresult_error.cpp
@@ -23,7 +23,7 @@ TEST_CASE("hresult,S_FALSE")
     try
     {
         check_hresult(S_FALSE);
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_error const & e)
     {
@@ -40,7 +40,7 @@ TEST_CASE("hresult,init_apartment")
     try
     {
         init_apartment(apartment_type::single_threaded);
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_error const & e)
     {
@@ -55,7 +55,7 @@ TEST_CASE("hresult,restricted,consuming")
     try
     {
         Uri uri(L"BAD");
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_invalid_argument const & e) // catching specific exception type
     {
@@ -66,7 +66,7 @@ TEST_CASE("hresult,restricted,consuming")
     try
     {
         Uri uri(L"BAD");
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_error const & e) // catching generic exception type
     {
@@ -501,7 +501,7 @@ TEST_CASE("hresult, std abi support")
         };
 
         handler(nullptr, 0);
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_error const& e)
     {
@@ -517,7 +517,7 @@ TEST_CASE("hresult, std abi support")
         };
 
         handler(nullptr, 0);
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (std::bad_alloc const&)
     {
@@ -531,7 +531,7 @@ TEST_CASE("hresult, std abi support")
         };
 
         handler(nullptr, 0);
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_out_of_bounds const& e)
     {
@@ -547,7 +547,7 @@ TEST_CASE("hresult, std abi support")
         };
 
         handler(nullptr, 0);
-        FAIL(L"Previous line should throw");
+        FAIL("Previous line should throw");
     }
     catch (hresult_invalid_argument const& e)
     {
@@ -575,4 +575,4 @@ TEST_CASE("hresult, to_message")
     {
         REQUIRE(to_message() == L"oh no, invalid handle");
     }
-}
+}
diff --git a/test/test/async_auto_cancel.cpp b/test/test/async_auto_cancel.cpp
@@ -5,36 +5,42 @@ using namespace Windows::Foundation;
 
 namespace
 {
+#ifdef __cpp_lib_coroutine
+    using std::suspend_never;
+#else
+    using std::experimental::suspend_never;
+#endif
+
     //
     // Checks that the coroutine is automatically canceled when reaching a suspension point.
     //
 
     IAsyncAction Action(HANDLE event)
     {
         co_await resume_on_signal(event);
-        co_await std::experimental::suspend_never();
+        co_await suspend_never();
         REQUIRE(false);
     }
 
     IAsyncActionWithProgress<int> ActionWithProgress(HANDLE event)
     {
         co_await resume_on_signal(event);
-        co_await std::experimental::suspend_never();
+        co_await suspend_never();
         REQUIRE(false);
     }
 
     IAsyncOperation<int> Operation(HANDLE event)
     {
         co_await resume_on_signal(event);
-        co_await std::experimental::suspend_never();
+        co_await suspend_never();
         REQUIRE(false);
         co_return 1;
     }
 
     IAsyncOperationWithProgress<int, int> OperationWithProgress(HANDLE event)
     {
         co_await resume_on_signal(event);
-        co_await std::experimental::suspend_never();
+        co_await suspend_never();
         REQUIRE(false);
         co_return 1;
     }
@@ -48,7 +54,7 @@ namespace
         auto cancel = co_await get_cancellation_token();
         cancel.callback(nullptr);
 
-        co_await std::experimental::suspend_never();
+        co_await suspend_never();
         REQUIRE(false);
     }