Author: rfm
Date: Tue Jul 12 19:54:40 2016
New Revision: 39989
URL: http://svn.gna.org/viewcvs/gnustep?rev=39989&view=rev
Log:
fixups for run loop handling
Modified:
libs/base/trunk/Tests/base/NSStream/memandfile_2.m
libs/base/trunk/Tests/base/NSStream/pipe.m
libs/base/trunk/Tests/base/NSStream/socket.m
libs/base/trunk/Tests/base/NSStream/socket_cs.m
Modified: libs/base/trunk/Tests/base/NSStream/memandfile_2.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSStream/memandfile_2.m?rev=39989&r1=39988&r2=39989&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSStream/memandfile_2.m (original)
+++ libs/base/trunk/Tests/base/NSStream/memandfile_2.m Tue Jul 12 19:54:40 2016
@@ -114,7 +114,8 @@
{
NSAutoreleasePool *arp = [NSAutoreleasePool new];
NSRunLoop *rl = [NSRunLoop currentRunLoop];
- NSData *answer;
+ NSData *answer = nil;
+ NSDate *end;
// first test, file to memory copy
NSString *path = @"memandfile.m";
@@ -128,7 +129,13 @@
[input open];
[output open];
defaultOutput = output;
- [rl runUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.5]];
+ end = [NSDate dateWithTimeIntervalSinceNow: 1.0];
+ while (NO == [goldData isEqualToData: answer]
+ && [end timeIntervalSinceNow] > 0.0)
+ {
+ [rl runMode: NSDefaultRunLoopMode beforeDate: end];
+ answer = [output propertyForKey: NSStreamDataWrittenToMemoryStreamKey];
+ }
answer = [output propertyForKey: NSStreamDataWrittenToMemoryStreamKey];
PASS([goldData isEqualToData: answer], "file to memory copy ok");
@@ -144,9 +151,17 @@
[input2 open];
[output2 open];
defaultInput = input2;
- [rl runUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.5]];
- NSData *answer2 = [NSData dataWithContentsOfFile: pathO];
+ end = [NSDate dateWithTimeIntervalSinceNow: 1.0];
+ NSData *answer2 = nil;
+ while (NO == [goldData isEqualToData: answer2]
+ && [end timeIntervalSinceNow] > 0.0)
+ {
+ [rl runMode: NSDefaultRunLoopMode beforeDate: end];
+ answer2 = [NSData dataWithContentsOfFile: pathO];
+ }
+
+ answer2 = [NSData dataWithContentsOfFile: pathO];
PASS([goldData isEqualToData: answer2], "memory to file copy ok");
[[NSFileManager defaultManager] removeFileAtPath: pathO handler: nil];
Modified: libs/base/trunk/Tests/base/NSStream/pipe.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSStream/pipe.m?rev=39989&r1=39988&r2=39989&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSStream/pipe.m (original)
+++ libs/base/trunk/Tests/base/NSStream/pipe.m Tue Jul 12 19:54:40 2016
@@ -50,7 +50,8 @@
}
case NSStreamEventErrorOccurred:
{
- NSAssert1(1, @"Error! code is %d", [[theStream streamError] code]);
+ NSAssert1(1, @"Error! code is %ld",
+ (long int)[[theStream streamError] code]);
break;
}
default:
@@ -66,6 +67,7 @@
NSRunLoop *rl = [NSRunLoop currentRunLoop];
Listener *li = [[Listener new] autorelease];
NSString *path = @"pipe.m";
+ NSDate *end;
[NSStream pipeWithInputStream:&defaultInput outputStream:&defaultOutput];
goldData = [NSData dataWithContentsOfFile:path];
@@ -76,8 +78,12 @@
[defaultOutput scheduleInRunLoop:rl forMode:NSDefaultRunLoopMode];
[defaultInput open];
[defaultOutput open];
- [rl run];
-
+ end = [NSDate dateWithTimeIntervalSinceNow: 0.5];
+ while (NO == [goldData isEqualToData:testData]
+ && [end timeIntervalSinceNow] > 0.0)
+ {
+ [rl runMode: NSDefaultRunLoopMode beforeDate: end];
+ }
PASS([goldData isEqualToData:testData], "Local pipe");
[arp release];
return 0;
Modified: libs/base/trunk/Tests/base/NSStream/socket.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSStream/socket.m?rev=39989&r1=39988&r2=39989&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSStream/socket.m (original)
+++ libs/base/trunk/Tests/base/NSStream/socket.m Tue Jul 12 19:54:40 2016
@@ -28,7 +28,7 @@
static uint8_t buffer[4096];
static BOOL doneWrite = NO;
int readSize;
-NSLog(@"Got %d on %p", streamEvent, theStream);
+NSLog(@"Got %ld on %p", (long int)streamEvent, theStream);
switch (streamEvent)
{
case NSStreamEventOpenCompleted:
@@ -98,7 +98,8 @@
}
default:
{
- NSAssert1(1, @"Error! code is %d", [[theStream streamError] code]);
+ NSAssert1(1, @"Error! code is %ld",
+ (long int)[[theStream streamError] code]);
break;
}
}
Modified: libs/base/trunk/Tests/base/NSStream/socket_cs.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSStream/socket_cs.m?rev=39989&r1=39988&r2=39989&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSStream/socket_cs.m (original)
+++ libs/base/trunk/Tests/base/NSStream/socket_cs.m Tue Jul 12 19:54:40 2016
@@ -25,9 +25,10 @@
case NSStreamEventHasBytesAvailable: return @"bytes available";
case NSStreamEventEndEncountered: return @"end encountered";
case NSStreamEventErrorOccurred:
- return [NSString stringWithFormat: @"error %d (%@)",
- [[stream streamError] code], [stream streamError]];
- default: return [NSString stringWithFormat: @"unknown event %d", event];
+ return [NSString stringWithFormat: @"error %ld (%@)",
+ (long int)[[stream streamError] code], [stream streamError]];
+ default:
+ return [NSString stringWithFormat: @"unknown event %ld", (long
int)event];
}
}
@@ -331,7 +332,11 @@
[clientOutput open];
end = [NSDate dateWithTimeIntervalSinceNow: 5];
- [rl runUntilDate: end];
+ while (NO == [goldData isEqualToData: testData]
+ && [end timeIntervalSinceNow] > 0.0)
+ {
+ [rl runMode: NSDefaultRunLoopMode beforeDate: end];
+ }
PASS([goldData isEqualToData: testData], "Local tcp");
if ([end timeIntervalSinceNow] < 0.0)
NSLog(@"%@ timed out.\n", prefix);
@@ -369,7 +374,11 @@
[clientOutput scheduleInRunLoop: rl forMode: NSDefaultRunLoopMode];
end = [NSDate dateWithTimeIntervalSinceNow: 5];
- [rl runUntilDate: end];
+ while (NO == [goldData isEqualToData: testData]
+ && [end timeIntervalSinceNow] > 0.0)
+ {
+ [rl runMode: NSDefaultRunLoopMode beforeDate: end];
+ }
PASS([goldData isEqualToData: testData], "Local tcp (blocking open)");
if ([end timeIntervalSinceNow] < 0.0)
NSLog(@"%@ timed out.\n", prefix);
@@ -405,7 +414,11 @@
[clientOutput open];
end = [NSDate dateWithTimeIntervalSinceNow: 5];
- [rl runUntilDate: end];
+ while (NO == [goldData isEqualToData: testData]
+ && [end timeIntervalSinceNow] > 0.0)
+ {
+ [rl runMode: NSDefaultRunLoopMode beforeDate: end];
+ }
PASS([goldData isEqualToData: testData], "Local socket");
if ([end timeIntervalSinceNow] < 0.0)
NSLog(@"%@ timed out.\n", prefix);
@@ -444,7 +457,11 @@
[clientOutput scheduleInRunLoop: rl forMode: NSDefaultRunLoopMode];
end = [NSDate dateWithTimeIntervalSinceNow: 5];
- [rl runUntilDate: end];
+ while (NO == [goldData isEqualToData: testData]
+ && [end timeIntervalSinceNow] > 0.0)
+ {
+ [rl runMode: NSDefaultRunLoopMode beforeDate: end];
+ }
PASS([goldData isEqualToData: testData], "Local socket (blocking open)");
if ([end timeIntervalSinceNow] < 0.0)
NSLog(@"%@ timed out.\n", prefix);
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
