Skip to content

Commit 9078942

Browse files
committed
Reorganize /test/ directory
1 parent 783090c commit 9078942

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

test/Install-TestDependencies.ps1 renamed to test/scripts/dep/Install-TestDependencies.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ try {
3939

4040
# Install linux dependencies
4141
$shellArgs = @(
42-
'scripts/linux/sourcepawn-dependencies.sh'
42+
'linux/sourcepawn-dependencies.sh'
4343
)
4444
& $provisionScriptBlock
4545
}
File renamed without changes.

test/Run-IntegrationTests.ps1 renamed to test/scripts/integration/Run-IntegrationTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $functionTestScriptBlock = {
2222

2323
"`n[sourcemod] Compile plugin via wrapper" | Write-Host
2424
$cmdArgs = @{
25-
File = "$PSScriptRoot\mod\sourcemod\addons\sourcemod\scripting\plugin1.sp"
25+
File = "$PSScriptRoot\..\..\mod\sourcemod\addons\sourcemod\scripting\plugin1.sp"
2626
Force = $true
2727
}
2828
$cmdArgs | Out-String -Stream | % { $_.Trim() } | ? { $_ } | Write-Verbose
@@ -31,7 +31,7 @@ $cmdArgs | Out-String -Stream | % { $_.Trim() } | ? { $_ } | Write-Verbose
3131

3232
"`n[sourcemod] Compile plugin via compiler" | Write-Host
3333
$cmdArgs = @{
34-
File = "$PSScriptRoot\mod\sourcemod\addons\sourcemod\scripting\plugin2.sp"
34+
File = "$PSScriptRoot\..\..\mod\sourcemod\addons\sourcemod\scripting\plugin2.sp"
3535
Force = $true
3636
SkipWrapper = $true
3737
}
@@ -49,7 +49,7 @@ $cmdArgs | Out-String -Stream | % { $_.Trim() } | ? { $_ } | Write-Verbose
4949
# - Displays all the output using 'less' at the end of the compilation, thus is limited to interactive use
5050
if ($env:OS) {
5151
$cmdArgs = @{
52-
File = "$PSScriptRoot\mod\amxmodx\addons\amxmodx\scripting\plugin1.sma"
52+
File = "$PSScriptRoot\..\..\mod\amxmodx\addons\amxmodx\scripting\plugin1.sma"
5353
Force = $true
5454
}
5555
$cmdArgs | Out-String -Stream | % { $_.Trim() } | ? { $_ } | Write-Verbose
@@ -58,7 +58,7 @@ if ($env:OS) {
5858

5959
"`n[amxmodx] Compile plugin via compiler" | Write-Host
6060
$cmdArgs = @{
61-
File = "$PSScriptRoot\mod\amxmodx\addons\amxmodx\scripting\plugin2.sma"
61+
File = "$PSScriptRoot\..\..\mod\amxmodx\addons\amxmodx\scripting\plugin2.sma"
6262
Force = $true
6363
SkipWrapper = $true
6464
}

test/test.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $global:PesterDebugPreference_ShowFullErrors = $true
88
try {
99
# Install test dependencies
1010
"Installing test dependencies" | Write-Host
11-
& "$PSScriptRoot\Install-TestDependencies.ps1" > $null
11+
& "$PSScriptRoot\scripts\dep\Install-TestDependencies.ps1" > $null
1212

1313
# Run unit tests
1414
"Running unit tests" | Write-Host
@@ -21,7 +21,7 @@ try {
2121

2222
# Run integration tests
2323
"Running integration tests" | Write-Host
24-
$integratedFailedCount = & "$PSScriptRoot\Run-IntegrationTests.ps1"
24+
$integratedFailedCount = & "$PSScriptRoot\scripts\integration\Run-IntegrationTests.ps1"
2525
if ($integratedFailedCount -gt 0) {
2626
$testFailed = $true
2727
}

0 commit comments

Comments
 (0)