Skip to content

Commit 39314ef

Browse files
owentowent
committed
Add PATH for unit test
1 parent cb88400 commit 39314ef

File tree

1 file changed

+72
-23
lines changed

1 file changed

+72
-23
lines changed

‎ci/do_ci.ps1‎

Lines changed: 72 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ switch ($action) {
6767
cmake $SRC_DIR `
6868
-DVCPKG_TARGET_TRIPLET=x64-windows `
6969
-DOPENTELEMETRY_BUILD_DLL=1 `
70-
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
70+
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
7171
$exit = $LASTEXITCODE
7272
if ($exit -ne 0) {
7373
exit $exit
@@ -90,7 +90,7 @@ switch ($action) {
9090
-DCMAKE_CXX_STANDARD=20 `
9191
-DVCPKG_TARGET_TRIPLET=x64-windows `
9292
-DOPENTELEMETRY_BUILD_DLL=1 `
93-
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
93+
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
9494
$exit = $LASTEXITCODE
9595
if ($exit -ne 0) {
9696
exit $exit
@@ -125,6 +125,14 @@ switch ($action) {
125125
if ($exit -ne 0) {
126126
exit $exit
127127
}
128+
129+
$ALL_DLL_FILES = Get-ChildItem -Path "./*.dll" -Recurse
130+
$ALL_DLL_DIRS = $(foreach ($dll_file in $ALL_DLL_FILES) {
131+
$dll_file.Directory.FullName
132+
}) | Sort-Object | Get-Unique
133+
$env:PATH = ($ALL_DLL_DIRS -Join [IO.Path]::PathSeparator) + [IO.Path]::PathSeparator + $env:PATH
134+
Write-Output "PATH=$env:PATH"
135+
128136
ctest -C Debug
129137
$exit = $LASTEXITCODE
130138
if ($exit -ne 0) {
@@ -151,6 +159,14 @@ switch ($action) {
151159
if ($exit -ne 0) {
152160
exit $exit
153161
}
162+
163+
$ALL_DLL_FILES = Get-ChildItem -Path "./*.dll" -Recurse
164+
$ALL_DLL_DIRS = $(foreach ($dll_file in $ALL_DLL_FILES) {
165+
$dll_file.Directory.FullName
166+
}) | Sort-Object | Get-Unique
167+
$env:PATH = ($ALL_DLL_DIRS -Join [IO.Path]::PathSeparator) + [IO.Path]::PathSeparator + $env:PATH
168+
Write-Output "PATH=$env:PATH"
169+
154170
ctest -C Debug
155171
$exit = $LASTEXITCODE
156172
if ($exit -ne 0) {
@@ -175,6 +191,14 @@ switch ($action) {
175191
if ($exit -ne 0) {
176192
exit $exit
177193
}
194+
195+
$ALL_DLL_FILES = Get-ChildItem -Path "./*.dll" -Recurse
196+
$ALL_DLL_DIRS = $(foreach ($dll_file in $ALL_DLL_FILES) {
197+
$dll_file.Directory.FullName
198+
}) | Sort-Object | Get-Unique
199+
$env:PATH = ($ALL_DLL_DIRS -Join [IO.Path]::PathSeparator) + [IO.Path]::PathSeparator + $env:PATH
200+
Write-Output "PATH=$env:PATH"
201+
178202
ctest -C Debug
179203
$exit = $LASTEXITCODE
180204
if ($exit -ne 0) {
@@ -196,6 +220,14 @@ switch ($action) {
196220
if ($exit -ne 0) {
197221
exit $exit
198222
}
223+
224+
$ALL_DLL_FILES = Get-ChildItem -Path "./*.dll" -Recurse
225+
$ALL_DLL_DIRS = $(foreach ($dll_file in $ALL_DLL_FILES) {
226+
$dll_file.Directory.FullName
227+
}) | Sort-Object | Get-Unique
228+
$env:PATH = ($ALL_DLL_DIRS -Join [IO.Path]::PathSeparator) + [IO.Path]::PathSeparator + $env:PATH
229+
Write-Output "PATH=$env:PATH"
230+
199231
ctest -C Debug
200232
$exit = $LASTEXITCODE
201233
if ($exit -ne 0) {
@@ -218,6 +250,14 @@ switch ($action) {
218250
if ($exit -ne 0) {
219251
exit $exit
220252
}
253+
254+
$ALL_DLL_FILES = Get-ChildItem -Path "./*.dll" -Recurse
255+
$ALL_DLL_DIRS = $(foreach ($dll_file in $ALL_DLL_FILES) {
256+
$dll_file.Directory.FullName
257+
}) | Sort-Object | Get-Unique
258+
$env:PATH = ($ALL_DLL_DIRS -Join [IO.Path]::PathSeparator) + [IO.Path]::PathSeparator + $env:PATH
259+
Write-Output "PATH=$env:PATH"
260+
221261
ctest -C Debug
222262
$exit = $LASTEXITCODE
223263
if ($exit -ne 0) {
@@ -264,6 +304,14 @@ switch ($action) {
264304
if ($exit -ne 0) {
265305
exit $exit
266306
}
307+
308+
$ALL_DLL_FILES = Get-ChildItem -Path "./*.dll" -Recurse
309+
$ALL_DLL_DIRS = $(foreach ($dll_file in $ALL_DLL_FILES) {
310+
$dll_file.Directory.FullName
311+
}) | Sort-Object | Get-Unique
312+
$env:PATH = ($ALL_DLL_DIRS -Join [IO.Path]::PathSeparator) + [IO.Path]::PathSeparator + $env:PATH
313+
Write-Output "PATH=$env:PATH"
314+
267315
ctest -C Debug
268316
$exit = $LASTEXITCODE
269317
if ($exit -ne 0) {
@@ -316,21 +364,22 @@ switch ($action) {
316364
cd "$BUILD_DIR"
317365

318366
if (Test-Path Env:\CXX_STANDARD) {
319-
$CXX_STANDARD = [int](Get-Item Env:\CXX_STANDARD).Value
320-
} else {
321-
$CXX_STANDARD = 17
367+
$CXX_STANDARD = [int](Get-Item Env:\CXX_STANDARD).Value
368+
}
369+
else {
370+
$CXX_STANDARD = 17
322371
}
323372
if (-not $CXX_STANDARD) {
324-
$CXX_STANDARD = 17
373+
$CXX_STANDARD = 17
325374
}
326375
Write-Host "Using CXX_STANDARD: $CXX_STANDARD"
327376

328377
$CMAKE_OPTIONS = @(
329-
"-DCMAKE_CXX_STANDARD=$CXX_STANDARD",
330-
"-DCMAKE_CXX_STANDARD_REQUIRED=ON",
331-
"-DCMAKE_CXX_EXTENSIONS=OFF",
332-
"-DVCPKG_TARGET_TRIPLET=x64-windows",
333-
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
378+
"-DCMAKE_CXX_STANDARD=$CXX_STANDARD",
379+
"-DCMAKE_CXX_STANDARD_REQUIRED=ON",
380+
"-DCMAKE_CXX_EXTENSIONS=OFF",
381+
"-DVCPKG_TARGET_TRIPLET=x64-windows",
382+
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
334383
)
335384

336385
cmake $SRC_DIR `
@@ -390,10 +439,10 @@ switch ($action) {
390439
cd "$BUILD_DIR\install_test"
391440

392441
cmake $CMAKE_OPTIONS `
393-
"-DCMAKE_PREFIX_PATH=$INSTALL_TEST_DIR" `
394-
"-DINSTALL_TEST_CMAKE_OPTIONS=$CMAKE_OPTIONS_STRING" `
395-
"-DINSTALL_TEST_COMPONENTS=$EXPECTED_COMPONENTS_STRING" `
396-
-S "$SRC_DIR\install\test\cmake"
442+
"-DCMAKE_PREFIX_PATH=$INSTALL_TEST_DIR" `
443+
"-DINSTALL_TEST_CMAKE_OPTIONS=$CMAKE_OPTIONS_STRING" `
444+
"-DINSTALL_TEST_COMPONENTS=$EXPECTED_COMPONENTS_STRING" `
445+
-S "$SRC_DIR\install\test\cmake"
397446

398447
$exit = $LASTEXITCODE
399448
if ($exit -ne 0) {
@@ -414,10 +463,10 @@ switch ($action) {
414463
Remove-Item -Recurse -Force "$INSTALL_TEST_DIR\*"
415464

416465
$CMAKE_OPTIONS = @(
417-
"-DCMAKE_CXX_STANDARD=17",
418-
"-DVCPKG_TARGET_TRIPLET=x64-windows",
419-
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake",
420-
"-DOPENTELEMETRY_BUILD_DLL=1"
466+
"-DCMAKE_CXX_STANDARD=17",
467+
"-DVCPKG_TARGET_TRIPLET=x64-windows",
468+
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake",
469+
"-DOPENTELEMETRY_BUILD_DLL=1"
421470
)
422471

423472
cmake $SRC_DIR `
@@ -485,10 +534,10 @@ switch ($action) {
485534
cd "$BUILD_DIR\install_test"
486535

487536
cmake $CMAKE_OPTIONS `
488-
"-DCMAKE_PREFIX_PATH=$INSTALL_TEST_DIR" `
489-
"-DINSTALL_TEST_CMAKE_OPTIONS=$CMAKE_OPTIONS_STRING" `
490-
"-DINSTALL_TEST_COMPONENTS=$EXPECTED_COMPONENTS_STRING" `
491-
-S "$SRC_DIR\install\test\cmake"
537+
"-DCMAKE_PREFIX_PATH=$INSTALL_TEST_DIR" `
538+
"-DINSTALL_TEST_CMAKE_OPTIONS=$CMAKE_OPTIONS_STRING" `
539+
"-DINSTALL_TEST_COMPONENTS=$EXPECTED_COMPONENTS_STRING" `
540+
-S "$SRC_DIR\install\test\cmake"
492541

493542
$exit = $LASTEXITCODE
494543
if ($exit -ne 0) {

0 commit comments

Comments
 (0)