From d97f80e0efd988b7c454a9f7c828044f252259ab Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 5 Apr 2022 23:00:34 +0200 Subject: [PATCH 01/10] Strip any spurious BOM from test input --- test/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5214d9cabc..d1a2719a2c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,11 +30,7 @@ if(WIN32) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_helper.ps1 "if (Test-Path $args[2]) { Remove-Item -Force $args[2] } \n" "$ErrorActionPreference = \"Stop\"\n" -"If ((Get-Content $args[1] | & file - | %{$_ -match \"BOM\"}) -contains $true) {\n" -"echo 'Skipped due to wrong input encoding'\n" -"exit 0\n" -"}\n" -"Get-Content $args[1] | & $args[0]\n" +"Get-Content $args[1] | {$_ -replace "\xEF\xBB\xBF", ""} | & $args[0]\n" "If ((Get-Content $args[2] | %{$_ -match \"FATAL\"}) -contains $true) {\n" "echo Error\n" "exit 1\n" From 94e4d74da5c6e253544c76dce39114679aaa2b4a Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 5 Apr 2022 23:18:10 +0200 Subject: [PATCH 02/10] Update CMakeLists.txt --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d1a2719a2c..1a3f5da069 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,7 +30,7 @@ if(WIN32) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_helper.ps1 "if (Test-Path $args[2]) { Remove-Item -Force $args[2] } \n" "$ErrorActionPreference = \"Stop\"\n" -"Get-Content $args[1] | {$_ -replace "\xEF\xBB\xBF", ""} | & $args[0]\n" +"Get-Content $args[1] | & {$_ -replace \"\xEF\xBB\xBF\", \"\"} | & $args[0]\n" "If ((Get-Content $args[2] | %{$_ -match \"FATAL\"}) -contains $true) {\n" "echo Error\n" "exit 1\n" From 046ecb33dd55d4fb4598fc3cfd4243dbe996a16d Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 5 Apr 2022 23:32:17 +0200 Subject: [PATCH 03/10] Update CMakeLists.txt --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1a3f5da069..6bf930bf8a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,7 +30,7 @@ if(WIN32) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_helper.ps1 "if (Test-Path $args[2]) { Remove-Item -Force $args[2] } \n" "$ErrorActionPreference = \"Stop\"\n" -"Get-Content $args[1] | & {$_ -replace \"\xEF\xBB\xBF\", \"\"} | & $args[0]\n" +"Get-Content $args[1] | & {$_ -replace \"\\xEF\\xBB\\xBF\", \"\"} | & $args[0]\n" "If ((Get-Content $args[2] | %{$_ -match \"FATAL\"}) -contains $true) {\n" "echo Error\n" "exit 1\n" From e2ec036619c6b0f6421ae03d13aed024ab6c83e2 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 6 Apr 2022 13:30:30 +0200 Subject: [PATCH 04/10] Update CMakeLists.txt --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6bf930bf8a..ddab5307b1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,7 +30,7 @@ if(WIN32) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_helper.ps1 "if (Test-Path $args[2]) { Remove-Item -Force $args[2] } \n" "$ErrorActionPreference = \"Stop\"\n" -"Get-Content $args[1] | & {$_ -replace \"\\xEF\\xBB\\xBF\", \"\"} | & $args[0]\n" +"Get-Content $args[1] | & %{$_ -replace \"\\xEF\\xBB\\xBF\", \"\"} | & $args[0]\n" "If ((Get-Content $args[2] | %{$_ -match \"FATAL\"}) -contains $true) {\n" "echo Error\n" "exit 1\n" From f43ca8c1e747ac6fdddfc21c0992aa6cebfc6413 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 6 Apr 2022 14:11:39 +0200 Subject: [PATCH 05/10] Update CMakeLists.txt --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ddab5307b1..601d9a4fdf 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,7 +30,7 @@ if(WIN32) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_helper.ps1 "if (Test-Path $args[2]) { Remove-Item -Force $args[2] } \n" "$ErrorActionPreference = \"Stop\"\n" -"Get-Content $args[1] | & %{$_ -replace \"\\xEF\\xBB\\xBF\", \"\"} | & $args[0]\n" +"Get-Content $args[1] | %{$_ -replace \"\\xEF\\xBB\\xBF\", \"\"} | & $args[0]\n" "If ((Get-Content $args[2] | %{$_ -match \"FATAL\"}) -contains $true) {\n" "echo Error\n" "exit 1\n" From e037ee4588a818c09fc4f4bd6b29ee319a914af5 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 6 Apr 2022 14:49:37 +0200 Subject: [PATCH 06/10] Update CMakeLists.txt --- test/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 601d9a4fdf..f32201a6f5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,6 +30,7 @@ if(WIN32) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_helper.ps1 "if (Test-Path $args[2]) { Remove-Item -Force $args[2] } \n" "$ErrorActionPreference = \"Stop\"\n" +"Get-Content $args[1] | %{$_ -replace \"\\xEF\\xBB\\xBF\", \"\"}\n" "Get-Content $args[1] | %{$_ -replace \"\\xEF\\xBB\\xBF\", \"\"} | & $args[0]\n" "If ((Get-Content $args[2] | %{$_ -match \"FATAL\"}) -contains $true) {\n" "echo Error\n" From 92cd53305800ac71e9b12498527c5509858ebdcf Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 6 Apr 2022 16:06:28 +0200 Subject: [PATCH 07/10] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1545d56db0..221e398acc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -117,7 +117,7 @@ jobs: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" cmake -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DBUILD_TESTING=OFF -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DMSVC_STATIC_CRT=ON .. cmake --build . --config Release - ctest + ctest -V - job: OSX_OpenMP pool: From 096762dc982a080c40eb3efcf69f289b15d75068 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 6 Apr 2022 16:51:52 +0200 Subject: [PATCH 08/10] Update azure-pipelines.yml --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 221e398acc..387b251499 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -118,6 +118,7 @@ jobs: cmake -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DBUILD_TESTING=OFF -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DMSVC_STATIC_CRT=ON .. cmake --build . --config Release ctest -V + dir test - job: OSX_OpenMP pool: From 4afdd88d15bc48fc29bd905833d19e67ec8a08b6 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 7 Apr 2022 08:54:19 +0200 Subject: [PATCH 09/10] Update CMakeLists.txt --- test/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f32201a6f5..786fdd7352 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -28,10 +28,10 @@ endforeach() # $1 exec, $2 input, $3 output_result if(WIN32) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_helper.ps1 +"[Console]::InputEncoding = New-Object Text.UTF8Encoding $false\n" "if (Test-Path $args[2]) { Remove-Item -Force $args[2] } \n" "$ErrorActionPreference = \"Stop\"\n" -"Get-Content $args[1] | %{$_ -replace \"\\xEF\\xBB\\xBF\", \"\"}\n" -"Get-Content $args[1] | %{$_ -replace \"\\xEF\\xBB\\xBF\", \"\"} | & $args[0]\n" +"Get-Content $args[1] | & $args[0]\n" "If ((Get-Content $args[2] | %{$_ -match \"FATAL\"}) -contains $true) {\n" "echo Error\n" "exit 1\n" From b8b2a0fe7dee7bb57cd47c610c9829ab3a611d49 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 7 Apr 2022 14:21:59 +0200 Subject: [PATCH 10/10] Update azure-pipelines.yml --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 387b251499..1545d56db0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -117,8 +117,7 @@ jobs: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" cmake -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DBUILD_TESTING=OFF -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DMSVC_STATIC_CRT=ON .. cmake --build . --config Release - ctest -V - dir test + ctest - job: OSX_OpenMP pool: