gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

patch for bug bug #42740

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37991 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2014-07-13 07:37:24 +00:00
parent e5c0b1887d
commit 121758341b
4 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,10 @@
2014-07-12 Yavor Doganov <yavor@gnu.org>
* Tests/GNUmakefile:
* Tests/base/Functions/NSGeometry1.m:
* Tests/base/NSRunLoop/performers.m:
Tweaks for running in sandbox (bug #42740)
2014-07-07 Yunqiang Su <wzssyqa@gmail.com> (tiny change) 2014-07-07 Yunqiang Su <wzssyqa@gmail.com> (tiny change)
* config/config.trampoline.c: * config/config.trampoline.c:
@ -11,7 +18,7 @@
to the empty string to avoid linking the tools against to the empty string to avoid linking the tools against
external libraries. external libraries.
2014-07-13 Yavor Doganov <yavor@gnu.org> 2014-06-30 Yavor Doganov <yavor@gnu.org>
* base.make.in: make base dependencies explicit only when statically * base.make.in: make base dependencies explicit only when statically
linnking (bug #42423) linnking (bug #42423)

2
Tests/GNUmakefile
View file

@ -63,7 +63,7 @@ check::
ADDITIONAL_INCLUDE_DIRS="-I$(TOP_DIR)/Headers -I$(TOP_DIR)/Source/$(GNUSTEP_TARGET_DIR)";\ ADDITIONAL_INCLUDE_DIRS="-I$(TOP_DIR)/Headers -I$(TOP_DIR)/Source/$(GNUSTEP_TARGET_DIR)";\
ADDITIONAL_LIB_DIRS="-L$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR)";\ ADDITIONAL_LIB_DIRS="-L$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR)";\
LD_LIBRARY_PATH="$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR):${LD_LIBRARY_PATH}";\ 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 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES;\
export ADDITIONAL_INCLUDE_DIRS;\ export ADDITIONAL_INCLUDE_DIRS;\
export ADDITIONAL_LIB_DIRS;\ export ADDITIONAL_LIB_DIRS;\

13
Tests/base/Functions/NSGeometry1.m
View file

@ -105,11 +105,14 @@ geom_string()
PASS((EQ(s2.width, s.width) && EQ(s2.height, s.height)), PASS((EQ(s2.width, s.width) && EQ(s2.height, s.height)),
"Can read output of NSStringFromSize"); "Can read output of NSStringFromSize");
dflt = [NSUserDefaults standardUserDefaults]; if ([[NSFileManager defaultManager] isWritableFileAtPath: NSHomeDirectory()])
[dflt setBool: YES forKey: @"GSMacOSXCompatible"]; {
[NSUserDefaults resetStandardUserDefaults]; dflt = [NSUserDefaults standardUserDefaults];
PASS((MacOSXCompatibleGeometry() == YES), [dflt setBool: YES forKey: @"GSMacOSXCompatible"];
"In MacOSX geometry compat mode"); [NSUserDefaults resetStandardUserDefaults];
PASS((MacOSXCompatibleGeometry() == YES),
"In MacOSX geometry compat mode");
}
#endif #endif
sp = NSStringFromPoint(p); sp = NSStringFromPoint(p);

7
Tests/base/NSRunLoop/performers.m
View file

@ -5,12 +5,13 @@
#import <Foundation/NSString.h> #import <Foundation/NSString.h>
#import <Foundation/NSArray.h> #import <Foundation/NSArray.h>
#import <Foundation/NSFileHandle.h> #import <Foundation/NSFileHandle.h>
#import <Foundation/NSDictionary.h>
#include <unistd.h> #include <unistd.h>
int main() int main()
{ {
NSAutoreleasePool *arp = [NSAutoreleasePool new]; START_SET("NSRunLoop performers")
NSRunLoop *run; NSRunLoop *run;
NSDate *date; NSDate *date;
NSMutableString *str; NSMutableString *str;
@ -45,6 +46,8 @@ int main()
date = [NSDate dateWithTimeIntervalSinceNow: delay]; date = [NSDate dateWithTimeIntervalSinceNow: delay];
[run runUntilDate: date]; [run runUntilDate: date];
[run runUntilDate: date]; [run runUntilDate: date];
if ([str isEqual: @""])
SKIP("it looks like stdin is redirected")
PASS([str isEqual: @"foo"], PASS([str isEqual: @"foo"],
"-performSelector:target:argument:order:modes: only sends the message once"); "-performSelector:target:argument:order:modes: only sends the message once");
@ -107,6 +110,6 @@ int main()
[fh closeFile]; [fh closeFile];
[fh release]; [fh release];
[arp release]; arp = nil; END_SET("NSRunLoop performers")
return 0; return 0;
} }