Skip to content

Commit fb7e38e

Browse files
committed
Don't run testcups on macOS for now.
1 parent 90d6799 commit fb7e38e

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

cups/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,10 @@ test: $(UNITTARGETS)
173173
rm -f test.log
174174
echo Running array API tests...
175175
./testarray 2>>test.log
176-
echo Running CUPS API tests...
177-
./testcups 2>>test.log
176+
if test `uname` != Darwin; then \
177+
echo Running CUPS API tests...; \
178+
./testcups 2>>test.log; \
179+
fi
178180
echo Running file API tests...
179181
./testfile 2>>test.log
180182
echo Running HTTP API tests...

cups/testcups.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ main(int argc, // I - Number of command-line arguments
313313
{
314314
size_t count; // Count
315315

316-
testEndMessage(true, "%d dests", num_dests);
316+
testEndMessage(true, "%u dests", (unsigned)num_dests);
317317

318318
for (count = num_dests, dest = dests; count > 0; count --, dest ++)
319319
{
@@ -380,7 +380,9 @@ main(int argc, // I - Number of command-line arguments
380380
}
381381
}
382382
else
383+
{
383384
testEndMessage(true, "%s", named_dest->name);
385+
}
384386

385387
if (named_dest)
386388
cupsFreeDests(1, named_dest);

xcode/libcups.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,6 +1071,7 @@
10711071
27D3967A27BB389C003D3D8E /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
10721072
27D3967E27BB38E6003D3D8E /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
10731073
27D3968227BB390D003D3D8E /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
1074+
27DD4F1A28ECE86300F20662 /* test-internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "test-internal.h"; path = "../cups/test-internal.h"; sourceTree = "<group>"; };
10741075
27F89DA21B3AC43B00E5A4B7 /* testraster.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = testraster.c; path = ../cups/testraster.c; sourceTree = "<group>"; };
10751076
720E854120164E7A00C6C411 /* ipp-file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ipp-file.c"; path = "../cups/ipp-file.c"; sourceTree = "<group>"; };
10761077
72220EAE1333047D00FCA411 /* libcups3.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libcups3.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1577,6 +1578,7 @@
15771578
273BF6B81333B4A90022CAAB /* tests */ = {
15781579
isa = PBXGroup;
15791580
children = (
1581+
27DD4F1A28ECE86300F20662 /* test-internal.h */,
15801582
2778BBDA275DA0D80070DA11 /* fuzzipp.c */,
15811583
2712866A1CC130FF00E517C7 /* rasterbench.c */,
15821584
727EF042192E3544001EF690 /* testarray.c */,

0 commit comments

Comments
 (0)