Skip to content

Commit 41e8740

Browse files
committed
Fix tests in Unity
1 parent e4a591a commit 41e8740

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

pack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fi
6565
dotnet pack --no-build --no-restore -c $CONFIGURATION $PUBLIC
6666

6767
if [[ x"$UPM" == x"1" ]]; then
68-
powershell scripts/Pack-Npm.ps1
68+
powershell scripts/Pack-Upm.ps1
6969
else
7070
srcdir="$DIR/build/packages"
7171
targetdir="$DIR/upm-ci~/packages"

scripts/Pack-Npm.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if ($Trace) {
1414
$srcDir = Join-Path $rootDirectory 'build\packages'
1515
$targetDir = Join-Path $rootDirectory 'upm-ci~\packages'
1616

17-
Remove-Item "$targetDir\*"
17+
Remove-Item "$targetDir\*" -Force -ErrorAction SilentlyContinue
1818
New-Item -itemtype Directory -Path $targetDir -Force -ErrorAction SilentlyContinue
1919

2020
Get-ChildItem -Directory $srcDir | % {

src/com.unity.editor.tasks/Tests/Editor/UnityBaseTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private static void SetupTest(out Stopwatch watch, out ILogging logger, out ITas
4545
{
4646
taskManager = new TaskManager().Initialize();
4747

48-
logger = new LogFacade(testName, new UnityLogAdapter(), true);
48+
logger = new LogFacade(testName, new UnityLogAdapter(), false);
4949
watch = new Stopwatch();
5050
}
5151

tests/Tasks.Tests/copyhelperbinaries.targets

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@
99
DependsOnTargets="AfterBuild;EnumerateHelperBinaries"
1010
AfterTargets="AfterBuild"
1111
Inputs="@(BinariesToCopy)"
12-
Outputs="@(BinariesToCopy->'$(PublishTo)$(PackageName)$(PackageSubFolder)%(RecursiveDir)%(Filename)%(Extension)');@(BinariesToCopy->'$(RootDir)$(PackageSource)$(PackageName)$(PackageSubFolder)%(RecursiveDir)%(Filename)%(Extension)')"
12+
Outputs="@(BinariesToCopy->'$(RootDir)$(PackageSource)$(PackageName)\Tests\$(PackageSubFolder)%(RecursiveDir)%(Filename)%(Extension)');@(BinariesToCopy->'$(PublishTo)$(PackageTestName)$(PackageSubFolder)%(RecursiveDir)%(Filename)%(Extension)')"
1313
>
1414

15-
<MakeDir Directories="$(PublishTo)$(PackageTestName)$(PackageSubFolder);$(RootDir)$(PackageSource)$(PackageName)$(PackageSubFolder)" />
16-
1715
<Copy
1816
SourceFiles="@(BinariesToCopy)"
19-
DestinationFiles="@(BinariesToCopy->'$(PublishTo)$(PackageName).tests$(PackageSubFolder)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
17+
DestinationFiles="@(BinariesToCopy->'$(PublishTo)$(PackageTestName)$(PackageSubFolder)%(RecursiveDir)%(Filename)%(Extension)')"
18+
SkipUnchangedFiles="true"
19+
/>
2020

2121
<Copy
2222
SourceFiles="@(BinariesToCopy)"
23-
DestinationFiles="@(BinariesToCopy->'$(RootDir)$(PackageSource)$(PackageName)$(PackageSubFolder)%(RecursiveDir)%(Filename)%(Extension)')"
23+
DestinationFiles="@(BinariesToCopy->'$(RootDir)$(PackageSource)$(PackageName)\Tests\$(PackageSubFolder)%(RecursiveDir)%(Filename)%(Extension)')"
2424
SkipUnchangedFiles="true"
2525
/>
2626

2727
</Target>
2828

2929
<Target Name="CleanHelperArtifacts" AfterTargets="AfterClean">
30-
<RemoveDir Directories="$(PublishTo)$(PackageName).tests$(PackageSubFolder);$(RootDir)$(PackageSource)$(PackageName)$(PackageSubFolder)" />
30+
<RemoveDir Directories="$(PublishTo)$(PackageTestName)$(PackageSubFolder);$(RootDir)$(PackageSource)$(PackageName)$(PackageSubFolder)" />
3131
</Target>
3232

3333
<Target Name="EnumerateHelperBinaries" Returns="@(BinariesToCopy)">

0 commit comments

Comments
 (0)