Changeset acf2f4


Ignore:
Timestamp:
May 14, 2010, 7:55:36 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Children:
f3adfe
Parents:
e62daa (diff), 0de871 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'FixTestRunnerClient' into CommandLineActionMapping

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/unittests/TestRunnerMain.cpp

    re62daa racf2f4  
    66 */
    77
     8// include config.h
     9#ifdef HAVE_CONFIG_H
     10#include <config.h>
     11#endif
     12
     13#ifdef HAVE_ECUT
    814// give the main function its correct name
    915#define CPPUNIT_MAIN main
    10 
    1116// include the TestRunnerClient file containing the main class
    1217#include "../../../TestRunnerClient.h"
    1318#include "../../../TestRunnerClient.cpp"
     19#else
     20#include "UnitTestMain.cpp"
     21#endif
     22
Note: See TracChangeset for help on using the changeset viewer.