Unify g_output and console initialization
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6802 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
37c2cce029
commit
27ed0e502b
7 changed files with 39 additions and 17 deletions
|
@ -6,13 +6,12 @@
|
|||
#include <time.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include "../util.h" // HACKHACK: for NSISRT_DEFINEGLOBALS
|
||||
|
||||
using namespace std; // for std::min
|
||||
|
||||
NSISRT_DEFINEGLOBALS(); // HACKHACK: This really belongs in textrunner.cpp?
|
||||
|
||||
void quit() {
|
||||
extern FILE *g_errout;
|
||||
_ftprintf(g_errout, _T("MMap quit\n"));
|
||||
}
|
||||
|
||||
|
|
|
@ -1,9 +1,14 @@
|
|||
#include <cppunit/CompilerOutputter.h>
|
||||
#include <cppunit/extensions/TestFactoryRegistry.h>
|
||||
#include <cppunit/ui/text/TestRunner.h>
|
||||
#include "../util.h" // for NSISRT_*
|
||||
|
||||
NSISRT_DEFINEGLOBALS();
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
if (!NSISRT_Initialize()) return 1;
|
||||
|
||||
// Get the top level suite from the registry
|
||||
CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@ class WinCharTest : public CppUnit::TestFixture {
|
|||
|
||||
public:
|
||||
void setUp() {
|
||||
NSISRT_Initialize(); // HACKHACK: This really belongs in textrunner.cpp?
|
||||
}
|
||||
|
||||
void testFromTchar() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue