Author: dmacvicar Date: Thu Mar 13 18:48:35 2008 New Revision: 9138 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9138&view=rev Log: fix tests Modified: trunk/libzypp/tests/CMakeLists.txt trunk/libzypp/tests/media/file_exists_test.cc trunk/libzypp/tests/zypp/CMakeLists.txt trunk/libzypp/tests/zypp/Vendor2_test.cc trunk/libzypp/tests/zypp/data/Vendor/zypp2.conf Modified: trunk/libzypp/tests/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/CMakeLists.txt?rev=9138&r1=9137&r2=9138&view=diff ============================================================================== --- trunk/libzypp/tests/CMakeLists.txt (original) +++ trunk/libzypp/tests/CMakeLists.txt Thu Mar 13 18:48:35 2008 @@ -1,8 +1,8 @@ ENABLE_TESTING() -ADD_DEFINITIONS( -DTESTS_SRC_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" ) +ADD_DEFINITIONS( -DTESTS_SRC_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" -DTESTS_BUILD_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}\\\" ) -ADD_SUBDIRECTORY( media EXCLUDE_FROM_ALL ) +#ADD_SUBDIRECTORY( media EXCLUDE_FROM_ALL ) ADD_SUBDIRECTORY( zypp ) ADD_SUBDIRECTORY( parser ) ADD_SUBDIRECTORY( repo ) Modified: trunk/libzypp/tests/media/file_exists_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/media/file_exists_test.cc?rev=9138&r1=9137&r2=9138&view=diff ============================================================================== --- trunk/libzypp/tests/media/file_exists_test.cc (original) +++ trunk/libzypp/tests/media/file_exists_test.cc Thu Mar 13 18:48:35 2008 @@ -10,7 +10,6 @@ #include #include - #include "mymediaverifier.h" using namespace zypp; @@ -35,22 +34,11 @@ mm.provideFile(id, src); dest = mm.localPath(id, src); BOOST_REQUIRE( PathInfo(dest).size() != 0 ); - - mm.doesFileExist(id, src); mm.provideFile(id, src); dest = mm.localPath(id, src); BOOST_REQUIRE( PathInfo(dest).size() != 0 ); - mm.doesFileExist(id, src); - mm.provideFile(id, src); - dest = mm.localPath(id, src); BOOST_REQUIRE( PathInfo(dest).size() != 0 ); - - mm.doesFileExist(id, src); - mm.provideFile(id, src); - dest = mm.localPath(id, src); - BOOST_CHECK_EQUAL( PathInfo(dest).size() , 1 ); - mm.release(id); } Modified: trunk/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/CMakeLists.txt?rev=9138&r1=9137&r2=9138&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/CMakeLists.txt (original) +++ trunk/libzypp/tests/zypp/CMakeLists.txt Thu Mar 13 18:48:35 2008 @@ -1,5 +1,12 @@ ADD_SUBDIRECTORY(base) +MESSAGE(STATUS "foo: ${CMAKE_SOURCE_DIR} and ${CMAKE_BINARY_DIR}") + +# set the vendor.d paths correctly for the tests +SET(VENDOR_D "${CMAKE_SOURCE_DIR}/tests/zypp/data/Vendor/vendors.d") +FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/tests/zypp/data/Vendor") +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/tests/zypp/data/Vendor/zypp2.conf ${CMAKE_BINARY_DIR}/tests/zypp/data/Vendor/zypp2.conf @ONLY) + ADD_TESTS( Arch Capabilities Modified: trunk/libzypp/tests/zypp/Vendor2_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Vendor2_test.cc?rev=9138&r1=9137&r2=9138&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/Vendor2_test.cc (original) +++ trunk/libzypp/tests/zypp/Vendor2_test.cc Thu Mar 13 18:48:35 2008 @@ -21,7 +21,7 @@ void reconfigureZConfig( const Pathname & ); } -#define DATADIR (Pathname(TESTS_SRC_DIR) + "/zypp/data/Vendor") +#define DATADIR (Pathname(TESTS_BUILD_DIR) + "/zypp/data/Vendor") BOOST_AUTO_TEST_CASE(vendor2_test) Modified: trunk/libzypp/tests/zypp/data/Vendor/zypp2.conf URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Vendor/zypp2.conf?rev=9138&r1=9137&r2=9138&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/data/Vendor/zypp2.conf (original) +++ trunk/libzypp/tests/zypp/data/Vendor/zypp2.conf Thu Mar 13 18:48:35 2008 @@ -123,5 +123,5 @@ ## Default value: /etc/zypp/vondors.d ## #vendordir = ./../../tests/zypp/data/Vendor/vendors.d -vendordir = ./data/Vendor/vendors.d +vendordir = @VENDOR_D@ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org