Fix build&run of testsHEADmaster

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

4 files changed, 16 insertions, 12 deletions

diff --git a/src/svnqt/tests/CMakeLists.txt b/src/svnqt/tests/CMakeLists.txt
index 6b15073..60193d0 100644
--- a/src/svnqt/tests/CMakeLists.txt
+++ b/src/svnqt/tests/CMakeLists.txt
@@ -1,3 +1,4 @@
+include_directories( ${CMAKE_SOURCE_DIR} )
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
 macro(build_test tname)
@@ -8,16 +9,17 @@ macro(build_test tname)
   add_executable(${tname} ${${tname}-src})
   target_link_libraries(${tname} ${svnqt-name} ${TQT_LIBRARIES})
   add_test(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
-endmacro(BUILD_TEST)
+endmacro(build_test)
 
 if (BUILD_TESTS)
     configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.in
         ${CMAKE_CURRENT_BINARY_DIR}/testconfig.h
     )
-    add_test(rmrepo "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/repo")
-    add_test(rmco "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/co")
     build_test(crepo)
     build_test(lsdir)
     build_test(ckpath)
+
+    # lsdir relies on output from crepo
+    set_tests_properties(crepo lsdir PROPERTIES RUN_SERIAL TRUE)
 endif(BUILD_TESTS)
diff --git a/src/svnqt/tests/ckpath.cpp b/src/svnqt/tests/ckpath.cpp
index 697e153..a404e50 100644
--- a/src/svnqt/tests/ckpath.cpp
+++ b/src/svnqt/tests/ckpath.cpp
@@ -15,7 +15,7 @@ int main(int,char**)
     }
     unsigned j = 0;
     while (pa.length()>0) {
-        std::cout << pa.path() << std::endl;
+        std::cout << pa.path().local8Bit() << std::endl;
         pa.removeLast();
         ++j;
     }
diff --git a/src/svnqt/tests/crepo.cpp b/src/svnqt/tests/crepo.cpp
index b07c09a..baaf444 100644
--- a/src/svnqt/tests/crepo.cpp
+++ b/src/svnqt/tests/crepo.cpp
@@ -17,17 +17,19 @@ class Listener:public svn::repository::RepositoryListener
         virtual ~Listener(){}
         virtual void sendWarning(const TQString&msg)
         {
-            std::cout << msg << std::endl;
+            std::cout << msg.local8Bit() << std::endl;
         }
         virtual void sendError(const TQString&msg)
         {
-            std::cout << msg << std::endl;
+            std::cout << msg.local8Bit() << std::endl;
         }
         virtual bool isCanceld(){return false;}
 };
 
 int main(int,char**)
 {
+    system("/bin/rm -rvf -- " TESTREPOPATH " " TESTCOPATH);
+
     TQString p = TESTREPOPATH;
     Listener ls;
     svn::repository::Repository rp(&ls);
diff --git a/src/svnqt/tests/lsdir.cpp b/src/svnqt/tests/lsdir.cpp
index 9edbc25..c8db993 100644
--- a/src/svnqt/tests/lsdir.cpp
+++ b/src/svnqt/tests/lsdir.cpp
@@ -28,8 +28,8 @@ int main(int,char**)
     std::cout << "List 1 "<<dlist.size()<<std::endl;
     for (unsigned int i=0; i < dlist.size();++i) {
         TQDateTime dt = svn::DateTime(dlist[i]->time());
-        std::cout << dlist[i]->name() << " "
-                << dlist[i]->lastAuthor() << " "
+        std::cout << dlist[i]->name().local8Bit() << " "
+                << dlist[i]->lastAuthor().local8Bit() << " "
                 << dlist[i]->size() << " "
                 << dt.toTime_t() << std::endl;
     }
@@ -44,8 +44,8 @@ int main(int,char**)
     std::cout << "List 2 "<<dlist.size()<<std::endl;
     for (unsigned int i=0; i < dlist.size();++i) {
         TQDateTime dt = svn::DateTime(dlist[i]->time());
-        std::cout << dlist[i]->name() << " "
-                << dlist[i]->lastAuthor() << " "
+        std::cout << dlist[i]->name().local8Bit() << " "
+                << dlist[i]->lastAuthor().local8Bit() << " "
                 << dlist[i]->size() << " "
                 << dt.toTime_t() << std::endl;
     }
@@ -59,7 +59,7 @@ int main(int,char**)
         return -1;
     }
     for (unsigned int i=0; i < slist.size();++i) {
-        std::cout << slist[i]->path()<< std::endl;
+        std::cout << slist[i]->path().local8Bit() << std::endl;
     }
     std::cout << "================"<<std::endl;
     std::cout << "Second status:"<<std::endl;
@@ -71,7 +71,7 @@ int main(int,char**)
         return -1;
     }
     for (unsigned int i=0; i < slist.size();++i) {
-        std::cout << slist[i]->path()<< std::endl;
+        std::cout << slist[i]->path().local8Bit() << std::endl;
     }
 
     return 0;