Merge branch 'master' into ci_upload_binaries

Fixed Windows compilation.
2013-12-07 22:08:54 +01:00
parent 38e19f7d35 ee217e94a8
commit cb73e2b90d
41 changed files with 1353 additions and 624 deletions
@@ -96,9 +96,8 @@ int main(int argc, char* argv[])
    options.reloadProfile();
    TestSuite testSuite("test/_tests.txt");
    result = testSuite.run();
-    int totalTests = testSuite.nbTests + testSuite.nbAITests;
    delete wagicCore;
-    DebugTrace("TestSuite done: failed test: " << result << " out of " << totalTests << " total");
+    DebugTrace("TestSuite done: failed test: " << result << " out of " << testSuite.nbTests + testSuite.nbAITests << " total");
 #ifdef CAPTURE_STDERR
    OutputCapturer::debugAndClear();
 #endif