Resolved Conflicts
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "368"
|
||||
endingLineNumber = "368"
|
||||
landmarkName = "test9()"
|
||||
landmarkName = "pauseTest()"
|
||||
landmarkType = "7">
|
||||
<Locations>
|
||||
<Location
|
||||
@@ -61,7 +61,7 @@
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "371"
|
||||
endingLineNumber = "371"
|
||||
landmarkName = "test9()"
|
||||
landmarkName = "pauseTest()"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
@@ -77,7 +77,7 @@
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "372"
|
||||
endingLineNumber = "372"
|
||||
landmarkName = "test9()"
|
||||
landmarkName = "pauseTest()"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
@@ -93,7 +93,7 @@
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "383"
|
||||
endingLineNumber = "383"
|
||||
landmarkName = "test9()"
|
||||
landmarkName = "pauseTest()"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
@@ -125,7 +125,7 @@
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "327"
|
||||
endingLineNumber = "327"
|
||||
landmarkName = "test8()"
|
||||
landmarkName = "sendPOSITest()"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
@@ -141,7 +141,7 @@
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "369"
|
||||
endingLineNumber = "369"
|
||||
landmarkName = "test9()"
|
||||
landmarkName = "pauseTest()"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
@@ -157,7 +157,7 @@
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "411"
|
||||
endingLineNumber = "411"
|
||||
landmarkName = "test9()"
|
||||
landmarkName = "pauseTest()"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
@@ -173,7 +173,7 @@
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "412"
|
||||
endingLineNumber = "412"
|
||||
landmarkName = "test9()"
|
||||
landmarkName = "pauseTest()"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
|
||||
@@ -32,14 +32,14 @@ void runTest(short (*f)())
|
||||
}
|
||||
}
|
||||
|
||||
short test1() // openUDP Test
|
||||
short openTest() // openUDP Test
|
||||
{
|
||||
printf("openUDP - ");
|
||||
struct xpcSocket sendPort = openUDP( 49062, "127.0.0.1", 49009 );
|
||||
return 0;
|
||||
}
|
||||
|
||||
short test2() // closeUDP test
|
||||
short closeTest() // closeUDP test
|
||||
{
|
||||
printf("closeUDP - ");
|
||||
struct xpcSocket sendPort = openUDP( 49063, "127.0.0.1", 49009 );
|
||||
@@ -48,7 +48,7 @@ short test2() // closeUDP test
|
||||
return 0;
|
||||
}
|
||||
|
||||
short test3() // send/read Test
|
||||
short sendReadTest() // send/read Test
|
||||
{
|
||||
printf("send/readUDP - ");
|
||||
|
||||
@@ -82,7 +82,7 @@ short test3() // send/read Test
|
||||
return 0;
|
||||
}
|
||||
|
||||
short test4() // Request DREF Test (Required for next tests)
|
||||
short requestDREFTest() // Request DREF Test (Required for next tests)
|
||||
{
|
||||
printf("requestDREF - ");
|
||||
|
||||
@@ -126,7 +126,7 @@ short test4() // Request DREF Test (Required for next tests)
|
||||
return 0;
|
||||
}
|
||||
|
||||
short test5() // sendDREF test
|
||||
short sendDREFTest() // sendDREF test
|
||||
{
|
||||
printf("sendDREF - ");
|
||||
|
||||
@@ -175,7 +175,7 @@ short test5() // sendDREF test
|
||||
return 0;
|
||||
}
|
||||
|
||||
short test6() // sendDATA test
|
||||
short sendDATATest() // sendDATA test
|
||||
{
|
||||
printf("sendData - ");
|
||||
|
||||
@@ -230,7 +230,7 @@ short test6() // sendDATA test
|
||||
return 0;
|
||||
}
|
||||
|
||||
short test7() // sendCTRL test
|
||||
short sendCTRLTest() // sendCTRL test
|
||||
{
|
||||
printf("sendCTRL - ");
|
||||
|
||||
@@ -285,7 +285,7 @@ short test7() // sendCTRL test
|
||||
return 0;
|
||||
}
|
||||
|
||||
short test8() // sendPOSI test
|
||||
short sendPOSITest() // sendPOSI test
|
||||
{
|
||||
printf("sendPOSI - ");
|
||||
|
||||
@@ -352,7 +352,7 @@ short test8() // sendPOSI test
|
||||
return 0;
|
||||
}
|
||||
|
||||
short test9() // pauseSim test
|
||||
short pauseTest() // pauseSim test
|
||||
{
|
||||
printf("pauseSim - ");
|
||||
|
||||
@@ -420,7 +420,7 @@ short test9() // pauseSim test
|
||||
return 0;
|
||||
}
|
||||
|
||||
short test10() // setConn test
|
||||
short connTest() // setConn test
|
||||
{
|
||||
printf("setConn - ");
|
||||
|
||||
@@ -475,16 +475,16 @@ int main(int argc, const char * argv[])
|
||||
printf("(Linux) \n");
|
||||
#endif
|
||||
|
||||
runTest(test1);
|
||||
runTest(test2);
|
||||
runTest(test3);
|
||||
runTest(test4);
|
||||
runTest(test5);
|
||||
runTest(test6);
|
||||
runTest(test7);
|
||||
runTest(test8);
|
||||
runTest(test9);
|
||||
runTest(test10);
|
||||
runTest(openTest);
|
||||
runTest(closeTest);
|
||||
runTest(sendReadTest);
|
||||
runTest(requestDREFTest);
|
||||
runTest(sendDREFTest);
|
||||
runTest(sendDATATest);
|
||||
runTest(sendCTRLTest);
|
||||
runTest(sendPOSITest);
|
||||
runTest(pauseTest);
|
||||
runTest(connTest);
|
||||
|
||||
printf( "----------------\nTest Summary\n\tFailed: %i\n\tPassed: %i\n", testFailed, testPassed );
|
||||
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Bucket
|
||||
type = "1"
|
||||
version = "2.0">
|
||||
</Bucket>
|
||||
@@ -1,86 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0500"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "BE9C6BAA1A253FA100EBE08A"
|
||||
BuildableName = "Cpp Tests"
|
||||
BlueprintName = "Cpp Tests"
|
||||
ReferencedContainer = "container:Cpp Tests.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "BE9C6BAA1A253FA100EBE08A"
|
||||
BuildableName = "Cpp Tests"
|
||||
BlueprintName = "Cpp Tests"
|
||||
ReferencedContainer = "container:Cpp Tests.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<BuildableProductRunnable>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "BE9C6BAA1A253FA100EBE08A"
|
||||
BuildableName = "Cpp Tests"
|
||||
BlueprintName = "Cpp Tests"
|
||||
ReferencedContainer = "container:Cpp Tests.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildableProductRunnable>
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
<BuildableProductRunnable>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "BE9C6BAA1A253FA100EBE08A"
|
||||
BuildableName = "Cpp Tests"
|
||||
BlueprintName = "Cpp Tests"
|
||||
ReferencedContainer = "container:Cpp Tests.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildableProductRunnable>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
@@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>SchemeUserState</key>
|
||||
<dict>
|
||||
<key>XPC Tests.xcscheme</key>
|
||||
<dict>
|
||||
<key>orderHint</key>
|
||||
<integer>0</integer>
|
||||
</dict>
|
||||
</dict>
|
||||
<key>SuppressBuildableAutocreation</key>
|
||||
<dict>
|
||||
<key>BE9C6BAA1A253FA100EBE08A</key>
|
||||
<dict>
|
||||
<key>primary</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
Reference in New Issue
Block a user