Commit e6ccb5ead53d90dd2eaf39911427280c8026233f
- Diff rendering mode:
- inline
- side by side
src/App.cpp
(0 / 5)
|   | |||
| 613 | 613 | { | |
| 614 | 614 | DEBUG_BLOCK | |
| 615 | 615 | QStringList testArgumentList; | |
| 616 | <<<<<<< HEAD:src/App.cpp | ||
| 617 | QString logPath = QDir::toNativeSeparators( Amarok::saveLocation( "testresults/" ) + QDateTime::currentDateTime().toString( "yyyy-MM-dd.HH-mm-ss" ) + '/' ); | ||
| 618 | testArgumentList << "amarok" << "-o" << logPath << "-xml" << "-v2"; | ||
| 619 | ======= | ||
| 620 | 616 | QString logPath = QDir::toNativeSeparators( Amarok::saveLocation( "testresults/" ) + QDateTime::currentDateTime().toString( "yyyy-MM-dd.HH-mm-ss" ) + "/" ); | |
| 621 | 617 | ||
| 622 | 618 | if( !stdout ) | |
| 623 | 619 | testArgumentList << "amarok" << "-o" << logPath << "-xml" << "-v2"; | |
| 624 | 620 | else | |
| 625 | 621 | testArgumentList << "amarok" << "-xml" << "-v2"; | |
| 626 | >>>>>>> make it possible to output test logs to stdout. to do this start amarok with --test --teststdout:src/App.cpp | ||
| 627 | 622 | ||
| 628 | 623 | // create log folder for this run: | |
| 629 | 624 | QDir logDir( logPath ); |

