[Carob-commits] CVS update of carob/test (CarobTestLauncher.cpp GNUmakefile)

[gilles]

    Date: Wednesday, November 23, 2005 @ 16:46:26
  Author: gilles
    Path: /cvsroot/carob/carob/test

Modified: CarobTestLauncher.cpp (1.4 -> 1.5) GNUmakefile (1.7 -> 1.8)

Fixed Qt Ui code (still not active code)l


-----------------------+
 CarobTestLauncher.cpp |    9 ++++++---
 GNUmakefile           |    6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)


Index: carob/test/CarobTestLauncher.cpp
diff -u carob/test/CarobTestLauncher.cpp:1.4 
carob/test/CarobTestLauncher.cpp:1.5
--- carob/test/CarobTestLauncher.cpp:1.4        Tue Nov 22 17:38:46 2005
+++ carob/test/CarobTestLauncher.cpp    Wed Nov 23 16:46:25 2005
@@ -20,8 +20,9 @@
  */
 
 #include <cppunit/ui/text/TestRunner.h>
-// #include <cppunit/ui/qt/TestRunner.h>
-
+// For QT ui, replace the above line by this:
+//#include <cppunit/ui/qt/TestRunner.h>
+//#include <qt3/qapplication.h>
 #include "CarobException.hpp"
 #include "Common.hpp"
 #include "TestBeginCommitRollback.hpp"
@@ -36,7 +37,9 @@
   setlocale(LC_ALL, "");
   std::set_unexpected(UnexpectedException::convertUnexpected);
   CppUnit::TextUi::TestRunner runner;
-  // CppUnit::QtUi::TestRunner runner;
+  // For QT ui, replace the above line by this:
+  //QApplication app(argc, argv);
+  //CppUnit::QtUi::TestRunner runner;
   runner.addTest(TestConnect::suite());
   runner.addTest(TestExecWriteRequest::suite());
   runner.addTest(TestExecReadRequest::suite());
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.7 carob/test/GNUmakefile:1.8
--- carob/test/GNUmakefile:1.7  Wed Nov 16 17:51:27 2005
+++ carob/test/GNUmakefile      Wed Nov 23 16:46:25 2005
@@ -31,7 +31,7 @@
 
 
 LIB_CPPUNIT                    = cppunit
-
+LIB_CPPUNIT_QTUI       = qttestrunner
 # TESTSRCS
 include testslist
 
@@ -39,7 +39,9 @@
 
 CXXFLAGS               = -g3 -Wall -I${INCDIR}
 LDFLAGS                = -Wl,-rpath,${CAROB_ROOT} -L${CAROB_ROOT} 
-l${LIB_CAROB} -ldl -l${LIB_CPPUNIT}
-EXE                    = carobTestLauncher
+# For QT ui, uncomment this
+#LDFLAGS                       += -l${LIB_CPPUNIT_QTUI}
+EXE                            = carobTestLauncher
 
 
 ${EXE}: ${TESTOBJS} CarobTestLauncher.o

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits