Overview
Comment: | ObjFWTest: Implement output on Nintendo Switch |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | objfwtest |
Files: | files | file ages | folders |
SHA3-256: |
dd7079d0924044e46436720aa467b64b |
User & Date: | js on 2024-02-15 22:34:01 |
Other Links: | branch diff | manifest | tags |
Context
2024-02-17
| ||
18:07 | Migrate OFStringTests to ObjFWTest check-in: 823cff099d user: js tags: objfwtest | |
2024-02-15
| ||
22:34 | ObjFWTest: Implement output on Nintendo Switch check-in: dd7079d092 user: js tags: objfwtest | |
22:13 | ObjFWTest: Implement output on Nintendo DS check-in: b93ad0661b user: js tags: objfwtest | |
Changes
Modified src/OFStdIOStream.m from [637dec590d] to [4e9d096bab].
︙ | ︙ | |||
426 427 428 429 430 431 432 | - (unsigned int)retainCount { return OFMaxRetainCount; } - (bool)hasTerminal { | | > | 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 | - (unsigned int)retainCount { return OFMaxRetainCount; } - (bool)hasTerminal { #if defined(OF_WII) || defined(OF_NINTENDO_DS) || defined(OF_NINTENDO_3DS) || \ defined(OF_NINTENDO_SWITCH) return true; #elif defined(HAVE_ISATTY) && !defined(OF_WII_U) return isatty(_fd); #else return false; #endif } |
︙ | ︙ |
Modified src/test/OTAppDelegate.m from [33dd8065bf] to [5a8390683c].
︙ | ︙ | |||
43 44 45 46 47 48 49 50 51 52 53 54 55 56 | #ifdef OF_NINTENDO_3DS /* Newer versions of libctru started using id as a parameter name. */ # define id id_3ds # include <3ds.h> # undef id #endif @interface OTAppDelegate: OFObject <OFApplicationDelegate> @end enum Status { StatusRunning, StatusOk, | > > > > > > > > > > > > > > > > > > | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | #ifdef OF_NINTENDO_3DS /* Newer versions of libctru started using id as a parameter name. */ # define id id_3ds # include <3ds.h> # undef id #endif #ifdef OF_NINTENDO_SWITCH # define id nx_id # include <switch.h> # undef id static OFDate *lastConsoleUpdate; static void updateConsole(bool force) { if (force || lastConsoleUpdate.timeIntervalSinceNow <= -1.0 / 60) { consoleUpdate(NULL); [lastConsoleUpdate release]; lastConsoleUpdate = [[OFDate alloc] init]; } } #endif @interface OTAppDelegate: OFObject <OFApplicationDelegate> @end enum Status { StatusRunning, StatusOk, |
︙ | ︙ | |||
99 100 101 102 103 104 105 106 107 108 109 110 111 112 | #elif defined(OF_NINTENDO_DS) consoleDemoInit(); #elif defined(OF_NINTENDO_3DS) gfxInitDefault(); atexit(gfxExit); consoleInit(GFX_TOP, NULL); #endif } - (OFSet OF_GENERIC(Class) *)testClasses { Class *classes = objc_copyClassList(NULL); OFMutableSet *testClasses; | > > > > | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | #elif defined(OF_NINTENDO_DS) consoleDemoInit(); #elif defined(OF_NINTENDO_3DS) gfxInitDefault(); atexit(gfxExit); consoleInit(GFX_TOP, NULL); #elif defined(OF_NINTENDO_SWITCH) consoleInit(NULL); padConfigureInput(1, HidNpadStyleSet_NpadStandard); updateConsole(true); #endif } - (OFSet OF_GENERIC(Class) *)testClasses { Class *classes = objc_copyClassList(NULL); OFMutableSet *testClasses; |
︙ | ︙ | |||
265 266 267 268 269 270 271 272 273 274 275 276 277 278 | hidScanInput(); if (hidKeysDown() & KEY_A) break; gspWaitForVBlank(); } #endif } } - (OFString *)descriptionForException: (id)exception { OFMutableString *description = [OFMutableString | > > > > > > > > > > > > > | 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 | hidScanInput(); if (hidKeysDown() & KEY_A) break; gspWaitForVBlank(); } #elif defined(OF_NINTENDO_SWITCH) [OFStdOut setForegroundColor: [OFColor silver]]; [OFStdOut writeLine: @"Press A to continue"]; while (appletMainLoop()) { PadState pad; padUpdate(&pad); updateConsole(true); if (padGetButtonsDown(&pad) & HidNpadButton_A) break; } #endif } } - (OFString *)descriptionForException: (id)exception { OFMutableString *description = [OFMutableString |
︙ | ︙ | |||
327 328 329 330 331 332 333 | { OFSet OF_GENERIC(Class) *testClasses = [self testClasses]; size_t numSucceeded = 0, numFailed = 0, numSkipped = 0; OFMutableDictionary *summaries = [OFMutableDictionary dictionary]; [OFStdOut setForegroundColor: [OFColor purple]]; [OFStdOut writeString: @"Found "]; | | > | 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | { OFSet OF_GENERIC(Class) *testClasses = [self testClasses]; size_t numSucceeded = 0, numFailed = 0, numSkipped = 0; OFMutableDictionary *summaries = [OFMutableDictionary dictionary]; [OFStdOut setForegroundColor: [OFColor purple]]; [OFStdOut writeString: @"Found "]; #if !defined(OF_WII) && !defined(OF_NINTENDO_DS) && \ !defined(OF_NINTENDO_3DS) && !defined(OF_NINTENDO_SWITCH) [OFStdOut setForegroundColor: [OFColor fuchsia]]; #endif [OFStdOut writeFormat: @"%zu", testClasses.count]; [OFStdOut setForegroundColor: [OFColor purple]]; [OFStdOut writeFormat: @" test case%s\n", (testClasses.count != 1 ? "s" : "")]; |
︙ | ︙ | |||
455 456 457 458 459 460 461 | [OFStdOut setForegroundColor: [OFColor navy]]; [OFStdOut writeFormat: @"%@: ", line.firstObject]; [OFStdOut setForegroundColor: [OFColor blue]]; [OFStdOut writeFormat: @"%@\n", line.secondObject]; } } | | > | > | > | 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | [OFStdOut setForegroundColor: [OFColor navy]]; [OFStdOut writeFormat: @"%@: ", line.firstObject]; [OFStdOut setForegroundColor: [OFColor blue]]; [OFStdOut writeFormat: @"%@\n", line.secondObject]; } } #if !defined(OF_WII) && !defined(OF_NINTENDO_DS) && \ !defined(OF_NINTENDO_3DS) && !defined(OF_NINTENDO_SWITCH) [OFStdOut setForegroundColor: [OFColor fuchsia]]; #else [OFStdOut setForegroundColor: [OFColor purple]]; #endif [OFStdOut writeFormat: @"%zu", numSucceeded]; [OFStdOut setForegroundColor: [OFColor purple]]; [OFStdOut writeFormat: @" test%s succeeded, ", (numSucceeded != 1 ? "s" : "")]; #if !defined(OF_WII) && !defined(OF_NINTENDO_DS) && \ !defined(OF_NINTENDO_3DS) && !defined(OF_NINTENDO_SWITCH) [OFStdOut setForegroundColor: [OFColor fuchsia]]; #endif [OFStdOut writeFormat: @"%zu", numFailed]; [OFStdOut setForegroundColor: [OFColor purple]]; [OFStdOut writeFormat: @" test%s failed, ", (numFailed != 1 ? "s" : "")]; #if !defined(OF_WII) && !defined(OF_NINTENDO_DS) && \ !defined(OF_NINTENDO_3DS) && !defined(OF_NINTENDO_SWITCH) [OFStdOut setForegroundColor: [OFColor fuchsia]]; #endif [OFStdOut writeFormat: @"%zu", numSkipped]; [OFStdOut setForegroundColor: [OFColor purple]]; [OFStdOut writeFormat: @" test%s skipped\n", (numSkipped != 1 ? "s" : "")]; [OFStdOut reset]; |
︙ | ︙ | |||
515 516 517 518 519 520 521 522 523 524 525 526 | hidScanInput(); if (hidKeysDown() & KEY_START) break; gspWaitForVBlank(); } #endif [OFApplication terminateWithStatus: (int)numFailed]; } @end | > > > > > | 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 | hidScanInput(); if (hidKeysDown() & KEY_START) break; gspWaitForVBlank(); } #elif defined(OF_NINTENDO_SWITCH) while (appletMainLoop()) updateConsole(true); consoleExit(NULL); #endif [OFApplication terminateWithStatus: (int)numFailed]; } @end |