Author: rfm
Date: Sun Jul 13 09:37:24 2014
New Revision: 37991
URL: http://svn.gna.org/viewcvs/gnustep?rev=37991&view=rev
Log:
patch for bug bug #42740
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Tests/GNUmakefile
libs/base/trunk/Tests/base/Functions/NSGeometry1.m
libs/base/trunk/Tests/base/NSRunLoop/performers.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=37991&r1=37990&r2=37991&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Sun Jul 13 09:37:24 2014
@@ -1,3 +1,10 @@
+2014-07-12 Yavor Doganov <[email protected]>
+
+ * Tests/GNUmakefile:
+ * Tests/base/Functions/NSGeometry1.m:
+ * Tests/base/NSRunLoop/performers.m:
+ Tweaks for running in sandbox (bug #42740)
+
2014-07-07 Yunqiang Su <[email protected]> (tiny change)
* config/config.trampoline.c:
@@ -11,7 +18,7 @@
to the empty string to avoid linking the tools against
external libraries.
-2014-07-13 Yavor Doganov <[email protected]>
+2014-06-30 Yavor Doganov <[email protected]>
* base.make.in: make base dependencies explicit only when statically
linnking (bug #42423)
Modified: libs/base/trunk/Tests/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/GNUmakefile?rev=37991&r1=37990&r2=37991&view=diff
==============================================================================
--- libs/base/trunk/Tests/GNUmakefile (original)
+++ libs/base/trunk/Tests/GNUmakefile Sun Jul 13 09:37:24 2014
@@ -63,7 +63,7 @@
ADDITIONAL_INCLUDE_DIRS="-I$(TOP_DIR)/Headers
-I$(TOP_DIR)/Source/$(GNUSTEP_TARGET_DIR)";\
ADDITIONAL_LIB_DIRS="-L$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR)";\
LD_LIBRARY_PATH="$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR):${LD_LIBRARY_PATH}";\
- PATH="$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR):${PATH}";\
+ PATH="$(TOP_DIR)/Tools/$(GNUSTEP_OBJ_DIR):${PATH}";\
export GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES;\
export ADDITIONAL_INCLUDE_DIRS;\
export ADDITIONAL_LIB_DIRS;\
Modified: libs/base/trunk/Tests/base/Functions/NSGeometry1.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/Functions/NSGeometry1.m?rev=37991&r1=37990&r2=37991&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/Functions/NSGeometry1.m (original)
+++ libs/base/trunk/Tests/base/Functions/NSGeometry1.m Sun Jul 13 09:37:24 2014
@@ -105,11 +105,14 @@
PASS((EQ(s2.width, s.width) && EQ(s2.height, s.height)),
"Can read output of NSStringFromSize");
- dflt = [NSUserDefaults standardUserDefaults];
- [dflt setBool: YES forKey: @"GSMacOSXCompatible"];
- [NSUserDefaults resetStandardUserDefaults];
- PASS((MacOSXCompatibleGeometry() == YES),
- "In MacOSX geometry compat mode");
+ if ([[NSFileManager defaultManager] isWritableFileAtPath: NSHomeDirectory()])
+ {
+ dflt = [NSUserDefaults standardUserDefaults];
+ [dflt setBool: YES forKey: @"GSMacOSXCompatible"];
+ [NSUserDefaults resetStandardUserDefaults];
+ PASS((MacOSXCompatibleGeometry() == YES),
+ "In MacOSX geometry compat mode");
+ }
#endif
sp = NSStringFromPoint(p);
Modified: libs/base/trunk/Tests/base/NSRunLoop/performers.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSRunLoop/performers.m?rev=37991&r1=37990&r2=37991&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSRunLoop/performers.m (original)
+++ libs/base/trunk/Tests/base/NSRunLoop/performers.m Sun Jul 13 09:37:24 2014
@@ -5,12 +5,13 @@
#import <Foundation/NSString.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSFileHandle.h>
+#import <Foundation/NSDictionary.h>
#include <unistd.h>
int main()
{
- NSAutoreleasePool *arp = [NSAutoreleasePool new];
+ START_SET("NSRunLoop performers")
NSRunLoop *run;
NSDate *date;
NSMutableString *str;
@@ -45,6 +46,8 @@
date = [NSDate dateWithTimeIntervalSinceNow: delay];
[run runUntilDate: date];
[run runUntilDate: date];
+ if ([str isEqual: @""])
+ SKIP("it looks like stdin is redirected")
PASS([str isEqual: @"foo"],
"-performSelector:target:argument:order:modes: only sends the message
once");
@@ -107,6 +110,6 @@
[fh closeFile];
[fh release];
- [arp release]; arp = nil;
+ END_SET("NSRunLoop performers")
return 0;
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
