comparison data/fileio/test/svcore-data-fileio-test.cpp @ 1450:a12fd0456f0c streaming-csv-writer

Merge from default branch
author Chris Cannam
date Tue, 17 Apr 2018 10:35:42 +0100
parents de385fed1197 48e9f538e6e9
children 4700b7188f6c
comparison
equal deleted inserted replaced
1449:deabf9fd3d28 1450:a12fd0456f0c
33 // get QMAKE_POST_LINK to add an arg to its command successfully on Windows 33 // get QMAKE_POST_LINK to add an arg to its command successfully on Windows
34 testDir = "../sonic-visualiser/svcore/data/fileio/test"; 34 testDir = "../sonic-visualiser/svcore/data/fileio/test";
35 #endif 35 #endif
36 36
37 if (argc > 1) { 37 if (argc > 1) {
38 cerr << "argc = " << argc << endl; 38 SVCERR << "argc = " << argc << endl;
39 testDir = argv[1]; 39 testDir = argv[1];
40 } 40 }
41 41
42 if (testDir != "") { 42 if (testDir != "") {
43 cerr << "Setting test directory base path to \"" << testDir << "\"" << endl; 43 SVCERR << "Setting test directory base path to \"" << testDir << "\"" << endl;
44 } 44 }
45 45
46 QCoreApplication app(argc, argv); 46 QCoreApplication app(argc, argv);
47 app.setOrganizationName("sonic-visualiser"); 47 app.setOrganizationName("sonic-visualiser");
48 app.setApplicationName("test-fileio"); 48 app.setApplicationName("test-fileio");
76 if (QTest::qExec(&t, argc, argv) == 0) ++good; 76 if (QTest::qExec(&t, argc, argv) == 0) ++good;
77 else ++bad; 77 else ++bad;
78 } 78 }
79 79
80 if (bad > 0) { 80 if (bad > 0) {
81 cerr << "\n********* " << bad << " test suite(s) failed!\n" << endl; 81 SVCERR << "\n********* " << bad << " test suite(s) failed!\n" << endl;
82 return 1; 82 return 1;
83 } else { 83 } else {
84 cerr << "All tests passed" << endl; 84 SVCERR << "All tests passed" << endl;
85 return 0; 85 return 0;
86 } 86 }
87 } 87 }