Index: ObjFW.xcodeproj/project.pbxproj ================================================================== --- ObjFW.xcodeproj/project.pbxproj +++ ObjFW.xcodeproj/project.pbxproj @@ -2211,20 +2211,20 @@ name = Release; }; 4BF33AF7133807310059CEF7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = STDOUT; + GCC_PREPROCESSOR_DEFINITIONS = STDOUT_SIMPLE; INSTALL_PATH = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 4BF33AF8133807310059CEF7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = STDOUT; + GCC_PREPROCESSOR_DEFINITIONS = STDOUT_SIMPLE; INSTALL_PATH = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; Index: tests/TestsAppDelegate.m ================================================================== --- tests/TestsAppDelegate.m +++ tests/TestsAppDelegate.m @@ -206,45 +206,59 @@ break; } [of_stdout writeString: str]; [of_stdout writeString: @"\033[m"]; +#elif defined(STDOUT_SIMPLE) + [of_stdout writeString: str]; #else # error No output method! #endif } - (void)outputTesting: (OFString*)test inModule: (OFString*)module { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; +#ifndef STDOUT_SIMPLE [self outputString: [OFString stringWithFormat: @"[%@] %@: testing...", module, test] inColor: YELLOW]; +#else + [self outputString: [OFString stringWithFormat: @"[%@] %@: ", + module, test] + inColor: YELLOW]; +#endif [pool release]; } - (void)outputSuccess: (OFString*)test inModule: (OFString*)module { +#ifndef STDOUT_SIMPLE OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; [self outputString: [OFString stringWithFormat: @"[%@] %@: ok\n", module, test] inColor: GREEN]; [pool release]; +#else + [self outputString: @"ok\n" + inColor: GREEN]; +#endif } - (void)outputFailure: (OFString*)test inModule: (OFString*)module { +#ifndef STDOUT_SIMPLE OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; [self outputString: [OFString stringWithFormat: @"[%@] %@: failed\n", module, test] inColor: RED]; [pool release]; -#ifdef __wii__ +# ifdef __wii__ [self outputString: @"Press A to continue!\n" inColor: NO_COLOR]; for (;;) { WPAD_ScanPads(); @@ -251,12 +265,12 @@ if (WPAD_ButtonsDown(0) & WPAD_BUTTON_A) return; VIDEO_WaitVSync(); } -#endif -#ifdef _PSP +# endif +# ifdef _PSP [self outputString: @"Press X to continue!\n" inColor: NO_COLOR]; for (;;) { SceCtrlData pad; @@ -267,10 +281,14 @@ if (!(pad.Buttons & PSP_CTRL_CROSS)) return; } } } +# endif +#else + [self outputString: @"failed\n" + inColor: RED]; #endif } - (void)applicationDidFinishLaunching {