From bb032fb6c782c2570cfab55bc36b8d38b9492964 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Thu, 10 Dec 2015 03:08:18 +0000
Subject: [PATCH] #1041  Still struggling with the test suite

---
 CMakeLists.txt                    | 26 --------------------------
 contrib/cmake/msvc/cmakeBuild.cmd |  2 --
 jenkins_daily.sh                  |  8 ++++++--
 samples/CMakeLists.txt            |  2 +-
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91b387d5..7376414e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,26 +104,6 @@ if( MSVC )
 
     ADD_DEFINITIONS(-DPSAPI_VERSION=1) # to be compatible with <= WinVista (#905)
 
-    ##
-    # Set the output directory
-    # x64/Win32
-    #if( CMAKE_SIZEOF_VOID_P MATCHES 8 )
-    #    SET( P_DIR x64)
-    #else()
-    #    set( P_DIR Win32 )
-    #endif()
-
-    # DLL/static build
-    #if( EXIV2_ENABLE_SHARED )
-    #    set( T_DIR Dynamic )
-    #else()
-    #    set( T_DIR Static)
-    #endif()
-
-    #set(B_DIR ${PROJECT_BINARY_DIR}/bin/${P_DIR}/${T_DIR})
-    #set(CMAKE_CURRENT_BINARY_DIR ${B_DIR})
-    #set(EXECUTABLE_OUTPUT_PATH   ${B_DIR})
-    #set(LIBRARY_OUTPUT_PATH      ${B_DIR})
 endif( MSVC )
 
 IF( EXIV2_ENABLE_XMP )
@@ -225,11 +205,5 @@ IF( MINGW OR UNIX OR APPLE)
   )
 ENDIF()
 
-##
-# support for test suite TODO: fixup for MSVC and think a bit more before deploying this
-# ENABLE_TESTING()
-# INCLUDE(Dart)
-# ADD_TEST(tests bash -c "cd ${CMAKE_SOURCE_DIR}/test/ ; make EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" )
-
 # That's all Folks!
 ##
diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index 4396fc96..667925d8 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -302,8 +302,6 @@ pushd        "%EXIV_B%"
         popd
         goto error_end
     )
-    if     defined _SILENT_ copy "samples\%_CONFIG_%\"*.exe "%_INSTALL_%\bin" >nul
-    if NOT defined _SILENT_ copy "samples\%_CONFIG_%\"*.exe "%_INSTALL_%\bin"
 popd
 
 if defined _TEST_ (
diff --git a/jenkins_daily.sh b/jenkins_daily.sh
index 20d4a594..8bddcd66 100755
--- a/jenkins_daily.sh
+++ b/jenkins_daily.sh
@@ -20,8 +20,9 @@ vs=2013
 ##
 # determine location of the build and source directories
 exiv2=$(cygpath -aw .)
-build=$(cygpath -aw ..\\build)
- dist=$(cygpath -au ..\\build\\dist\\$vs\\$arch\\$mode\\$config\\bin)
+build=$(cygpath -aw .\\build)
+ dist=$(cygpath -au .\\build\\dist\\$vs\\$arch\\$mode\\$config\\bin)
+ di32=$(cygpath -au .\\build\\dist\\$vs\\Win32\\$mode\\$config\\bin)
  msvc=$(cygpath -aw ./contrib/cmake/msvc)
 
 ##
@@ -42,6 +43,9 @@ mkdir -p  $dist
 ##
 # test the build
 export EXIV2_BINDIR=$dist
+if [ ! -e $dist/exiv2.exe -a -e $di32/exiv2.exe ]; then
+    export EXIV2_BINDIR=$di32
+fi 
 pushd  test
     for test in addmoddel.sh \
         bugfixes-test.sh     \
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index edd51721..24a9d355 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -49,7 +49,7 @@ FOREACH(entry ${SAMPLES})
     ADD_EXECUTABLE( ${target} ${target}.cpp )
     ADD_TEST( ${target}_test ${target} )
     TARGET_LINK_LIBRARIES( ${target} ${PRIVATE_VAR} exiv2lib ${EXPAT_LIBRARIES})
-    #INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} )
+    INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} )
 ENDFOREACH(entry ${SAMPLES})
 
 ###################################