FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflicts in test plan files.

Browse Source
This commit is contained in:
Brent Simmons 2024-05-21 18:08:11 -07:00
parent 6df9d1a45f
commit 1fee1f53ad
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Mac.xctestplan
View File

@ -47,7 +47,7 @@
{ {
"parallelizable" : true, "parallelizable" : true,
"target" : { "target" : {
"containerPath" : "container:", "containerPath" : "container:Core",
"identifier" : "CoreTests", "identifier" : "CoreTests",
"name" : "CoreTests" "name" : "CoreTests"
} }
@ -55,8 +55,7 @@
{ {
"parallelizable" : true, "parallelizable" : true,
"target" : { "target" : {
"containerPath" : "container:", "containerPath" : "container:Feedly",
<<<<<<< HEAD
"identifier" : "FeedlyTests", "identifier" : "FeedlyTests",
"name" : "FeedlyTests" "name" : "FeedlyTests"
} }
@ -64,13 +63,17 @@
{ {
"parallelizable" : true, "parallelizable" : true,
"target" : { "target" : {
"containerPath" : "container:", "containerPath" : "container:Account",
"identifier" : "AccountTests", "identifier" : "AccountTests",
"name" : "AccountTests" "name" : "AccountTests"
======= }
"identifier" : "WebTests", },
"name" : "WebTests" {
>>>>>>> 72e83becb1becceba3c41a747d377a7bfab51bf4 "parallelizable" : true,
"target" : {
"containerPath" : "container:Web",
"identifier" : "WebTests",
"name" : "WebTests"
} }
} }
], ],

10
iOS.xctestplan
View File

@ -23,7 +23,7 @@
{ {
"parallelizable" : true, "parallelizable" : true,
"target" : { "target" : {
"containerPath" : "container:", "containerPath" : "container:Core",
"identifier" : "CoreTests", "identifier" : "CoreTests",
"name" : "CoreTests" "name" : "CoreTests"
} }
@ -31,7 +31,7 @@
{ {
"parallelizable" : true, "parallelizable" : true,
"target" : { "target" : {
"containerPath" : "container:..\/Tree", "containerPath" : "container:Tree",
"identifier" : "TreeTests", "identifier" : "TreeTests",
"name" : "TreeTests" "name" : "TreeTests"
} }
@ -39,7 +39,7 @@
{ {
"parallelizable" : true, "parallelizable" : true,
"target" : { "target" : {
"containerPath" : "container:", "containerPath" : "container:Feedly",
"identifier" : "FeedlyTests", "identifier" : "FeedlyTests",
"name" : "FeedlyTests" "name" : "FeedlyTests"
} }
@ -47,7 +47,7 @@
{ {
"parallelizable" : true, "parallelizable" : true,
"target" : { "target" : {
"containerPath" : "container:", "containerPath" : "container:Account",
"identifier" : "AccountTests", "identifier" : "AccountTests",
"name" : "AccountTests" "name" : "AccountTests"
} }
@ -63,7 +63,7 @@
{ {
"parallelizable" : true, "parallelizable" : true,
"target" : { "target" : {
"containerPath" : "container:", "containerPath" : "container:Web",
"identifier" : "WebTests", "identifier" : "WebTests",
"name" : "WebTests" "name" : "WebTests"
} }