Overview
| Comment: | tests: Use OSReport() to output test results |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | wii-u |
| Files: | files | file ages | folders |
| SHA3-256: |
ed618ae2c7794c392c1f31d1e2947353 |
| User & Date: | js on 2022-07-31 16:04:02 |
| Other Links: | branch diff | manifest | tags |
Context
|
2022-07-31
| ||
| 16:06 | Ignore tests/tests.rpx in VCS check-in: 8384094996 user: js tags: wii-u | |
| 16:04 | tests: Use OSReport() to output test results check-in: ed618ae2c7 user: js tags: wii-u | |
| 14:27 | Fix accidental renames that happened during merge check-in: 15ab5fb29d user: js tags: wii-u | |
Changes
Modified tests/TestsAppDelegate.m from [a6eba3166b] to [845a6f5691].
| ︙ | ︙ | |||
33 34 35 36 37 38 39 40 41 42 43 44 45 46 | #ifdef OF_WII # define asm __asm__ # include <gccore.h> # include <wiiuse/wpad.h> # undef asm #endif #ifdef OF_NINTENDO_DS # define asm __asm__ # include <nds.h> # undef asm #endif | > > > > > > | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | #ifdef OF_WII # define asm __asm__ # include <gccore.h> # include <wiiuse/wpad.h> # undef asm #endif #ifdef OF_WII_U # define BOOL WUT_BOOL # include <coreinit/debug.h> # undef BOOL #endif #ifdef OF_NINTENDO_DS # define asm __asm__ # include <nds.h> # undef asm #endif |
| ︙ | ︙ | |||
224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 |
consoleExit(NULL);
abort();
# else
abort();
# endif
}
#else
return OFApplicationMain(&argc, &argv, [[TestsAppDelegate alloc] init]);
#endif
}
@implementation TestsAppDelegate
- (void)outputTesting: (OFString *)test inModule: (OFString *)module
{
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor yellow]];
[OFStdOut writeFormat: @"[%@] %@: testing...", module, test];
} else
[OFStdOut writeFormat: @"[%@] %@: ", module, test];
#ifdef OF_NINTENDO_SWITCH
updateConsole(false);
#endif
}
- (void)outputSuccess: (OFString *)test inModule: (OFString *)module
{
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor lime]];
[OFStdOut eraseLine];
[OFStdOut writeFormat: @"\r[%@] %@: ok\n", module, test];
} else
[OFStdOut writeLine: @"ok"];
#ifdef OF_NINTENDO_SWITCH
updateConsole(false);
#endif
}
- (void)outputFailure: (OFString *)test inModule: (OFString *)module
{
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor red]];
[OFStdOut eraseLine];
[OFStdOut writeFormat: @"\r[%@] %@: failed\n", module, test];
} else
[OFStdOut writeLine: @"failed"];
| > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | > > > | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 |
consoleExit(NULL);
abort();
# else
abort();
# endif
}
#elif defined(OF_WII_U)
@try {
return OFApplicationMain(&argc, &argv,
[[TestsAppDelegate alloc] init]);
} @catch (id e) {
OSReport("\nRuntime error: Unhandled exception:\n%s\n",
[[e description] UTF8String]);
OSReport("\nBacktrace:\n %s\n\n",
[[e backtrace] componentsJoinedByString: @"\n "]
.UTF8String);
abort();
}
#else
return OFApplicationMain(&argc, &argv, [[TestsAppDelegate alloc] init]);
#endif
}
@implementation TestsAppDelegate
- (void)outputTesting: (OFString *)test inModule: (OFString *)module
{
#ifndef OF_WII_U
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor yellow]];
[OFStdOut writeFormat: @"[%@] %@: testing...", module, test];
} else
[OFStdOut writeFormat: @"[%@] %@: ", module, test];
#else
OSReport("[%s] %s: ", module.UTF8String, test.UTF8String);
#endif
#ifdef OF_NINTENDO_SWITCH
updateConsole(false);
#endif
}
- (void)outputSuccess: (OFString *)test inModule: (OFString *)module
{
#ifndef OF_WII_U
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor lime]];
[OFStdOut eraseLine];
[OFStdOut writeFormat: @"\r[%@] %@: ok\n", module, test];
} else
[OFStdOut writeLine: @"ok"];
#else
OSReport("ok\n");
#endif
#ifdef OF_NINTENDO_SWITCH
updateConsole(false);
#endif
}
- (void)outputFailure: (OFString *)test inModule: (OFString *)module
{
#ifndef OF_WII_U
if (OFStdOut.hasTerminal) {
[OFStdOut setForegroundColor: [OFColor red]];
[OFStdOut eraseLine];
[OFStdOut writeFormat: @"\r[%@] %@: failed\n", module, test];
} else
[OFStdOut writeLine: @"failed"];
# ifdef OF_WII
[OFStdOut reset];
[OFStdOut writeLine: @"Press A to continue!"];
for (;;) {
WPAD_ScanPads();
if (WPAD_ButtonsDown(0) & WPAD_BUTTON_A)
return;
VIDEO_WaitVSync();
}
# endif
# ifdef OF_PSP
[OFStdOut reset];
[OFStdOut writeLine: @"Press X to continue!"];
for (;;) {
SceCtrlData pad;
sceCtrlReadBufferPositive(&pad, 1);
if (pad.Buttons & PSP_CTRL_CROSS) {
for (;;) {
sceCtrlReadBufferPositive(&pad, 1);
if (!(pad.Buttons & PSP_CTRL_CROSS))
return;
}
}
}
# endif
# ifdef OF_NINTENDO_DS
[OFStdOut reset];
[OFStdOut writeString: @"Press A to continue!"];
for (;;) {
swiWaitForVBlank();
scanKeys();
if (keysDown() & KEY_A)
break;
}
# endif
# ifdef OF_NINTENDO_3DS
[OFStdOut reset];
[OFStdOut writeString: @"Press A to continue!"];
for (;;) {
hidScanInput();
if (hidKeysDown() & KEY_A)
break;
gspWaitForVBlank();
}
# endif
# ifdef OF_NINTENDO_SWITCH
[OFStdOut reset];
[OFStdOut writeString: @"Press A to continue!"];
while (appletMainLoop()) {
PadState pad;
padUpdate(&pad);
updateConsole(true);
if (padGetButtonsDown(&pad) & HidNpadButton_A)
break;
}
# endif
if (OFStdOut.hasTerminal) {
[OFStdOut writeString: @"\r"];
[OFStdOut reset];
[OFStdOut eraseLine];
}
#else
OSReport("failed\n");
#endif
}
- (void)applicationDidFinishLaunching
{
#if defined(OF_IOS) && defined(OF_HAVE_FILES)
CFBundleRef mainBundle = CFBundleGetMainBundle();
CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
|
| ︙ | ︙ |