Menu
▾
▴
[Opensync-commits] r5060 - plugins/mozilla-sync/trunk/tests
|
From: <dg...@su...> - 2009-01-09 10:37:08
|
Author: henrik Date: Fri Jan 9 11:36:29 2009 New Revision: 5060 URL: http://www.opensync.org/changeset/5060 Log: make tests work on FreeBSD Modified: plugins/mozilla-sync/trunk/tests/CMakeLists.txt plugins/mozilla-sync/trunk/tests/blackbox_test_abook_fmod.sh plugins/mozilla-sync/trunk/tests/blackbox_test_cal_fmod.sh plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in plugins/mozilla-sync/trunk/tests/unit_test_common.h Modified: plugins/mozilla-sync/trunk/tests/CMakeLists.txt ============================================================================== --- plugins/mozilla-sync/trunk/tests/CMakeLists.txt Thu Jan 8 20:06:03 2009 (r5059) +++ plugins/mozilla-sync/trunk/tests/CMakeLists.txt Fri Jan 9 11:36:29 2009 (r5060) @@ -7,6 +7,13 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../src ${CHECK_INCLUDE_DIR} ${XPCOM_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ) +LINK_DIRECTORIES( + ${OPENSYNC_LIBRARY_DIRS} + ${XPCOM_LIBRARY_DIRS} + ${LIBXML2_LIBRARY_DIRS} + ${GLIB2_LIBRARY_DIRS} + ${ICAL_LIBRARY_DIRS} ) + ADD_DEFINITIONS( -DGRE_DIR="${GRE_DIR}" ) ADD_EXECUTABLE( unit_test_xpcom unit_test_xpcom.cpp unit_test_common.cpp @@ -50,19 +57,19 @@ CONFIGURE_FILE( "blackbox_test_cal_vcard_base/2" "tests/blackbox_test_cal_vcard_base/2" COPYONLY) CONFIGURE_FILE( "blackbox_test_cal_vevent_additional/add1" "tests/blackbox_test_cal_vevent_additional/add1" COPYONLY) -ADD_TEST( blackbox_test_init_thunderbird "blackbox_test_init_thunderbird.sh" ) -ADD_TEST( blackbox_test_init_osynctool "blackbox_test_init_osynctool.sh" ) -ADD_TEST( blackbox_test_abook_vcard_compare "blackbox_test_abook_vcard_compare.sh" ) -ADD_TEST( blackbox_test_abook_slow_slow "blackbox_test_abook_slow_slow.sh" ) -ADD_TEST( blackbox_test_abook_slow3 "blackbox_test_abook_slow3.sh" ) -ADD_TEST( blackbox_test_abook_slow_fast "blackbox_test_abook_slow_fast.sh" ) -ADD_TEST( blackbox_test_abook_add "blackbox_test_abook_add.sh" ) -ADD_TEST( blackbox_test_abook_delete "blackbox_test_abook_delete.sh" ) -ADD_TEST( blackbox_test_abook_fmod "blackbox_test_abook_fmod.sh" ) -ADD_TEST( blackbox_test_init_sunbird "blackbox_test_init_sunbird.sh" ) -ADD_TEST( blackbox_test_cal_slow_slow "blackbox_test_cal_slow_slow.sh" ) -ADD_TEST( blackbox_test_cal_slow3 "blackbox_test_cal_slow3.sh" ) -ADD_TEST( blackbox_test_cal_slow_fast "blackbox_test_cal_slow_fast.sh" ) -ADD_TEST( blackbox_test_cal_add "blackbox_test_cal_add.sh" ) -ADD_TEST( blackbox_test_cal_delete "blackbox_test_cal_delete.sh" ) -ADD_TEST( blackbox_test_cal_fmod "blackbox_test_cal_fmod.sh" ) +ADD_TEST( blackbox_test_init_thunderbird bash "blackbox_test_init_thunderbird.sh" ) +ADD_TEST( blackbox_test_init_osynctool bash "blackbox_test_init_osynctool.sh" ) +ADD_TEST( blackbox_test_abook_vcard_compare bash "blackbox_test_abook_vcard_compare.sh" ) +ADD_TEST( blackbox_test_abook_slow_slow bash "blackbox_test_abook_slow_slow.sh" ) +ADD_TEST( blackbox_test_abook_slow3 bash "blackbox_test_abook_slow3.sh" ) +ADD_TEST( blackbox_test_abook_slow_fast bash "blackbox_test_abook_slow_fast.sh" ) +ADD_TEST( blackbox_test_abook_add bash "blackbox_test_abook_add.sh" ) +ADD_TEST( blackbox_test_abook_delete bash "blackbox_test_abook_delete.sh" ) +ADD_TEST( blackbox_test_abook_fmod bash "blackbox_test_abook_fmod.sh" ) +ADD_TEST( blackbox_test_init_sunbird bash "blackbox_test_init_sunbird.sh" ) +ADD_TEST( blackbox_test_cal_slow_slow bash "blackbox_test_cal_slow_slow.sh" ) +ADD_TEST( blackbox_test_cal_slow3 bash "blackbox_test_cal_slow3.sh" ) +ADD_TEST( blackbox_test_cal_slow_fast bash "blackbox_test_cal_slow_fast.sh" ) +ADD_TEST( blackbox_test_cal_add bash "blackbox_test_cal_add.sh" ) +ADD_TEST( blackbox_test_cal_delete bash "blackbox_test_cal_delete.sh" ) +ADD_TEST( blackbox_test_cal_fmod bash "blackbox_test_cal_fmod.sh" ) Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_abook_fmod.sh ============================================================================== --- plugins/mozilla-sync/trunk/tests/blackbox_test_abook_fmod.sh Thu Jan 8 20:06:03 2009 (r5059) +++ plugins/mozilla-sync/trunk/tests/blackbox_test_abook_fmod.sh Fri Jan 9 11:36:29 2009 (r5060) @@ -29,7 +29,7 @@ # Modify a VCard file # Fast sync it into Thunderbird banner_step "Fast sync after add" -sed -i s/first\ department/new\ department/ "${VCARD_DIR_1}/1" +sed -i.bak "s/first\ department/new\ department/" "${VCARD_DIR_1}/1" msync_sync "${GROUP_NAME_1}" # Slow sync Thunderbird to a new VCard directory in a new group @@ -40,7 +40,7 @@ create_msync_group_abook_file "${GROUP_NAME_1C}" abook.mab "${VCARD_DIR_1C}" msync_sync "${GROUP_NAME_1C}" copy_dir VCARD_DIR_A vcard_orig_for_compare "${VCARD_DIR_BASE}" -sed -i s/first\ department/new\ department/ "${VCARD_DIR_A}/1" +sed -i.bak s"/first\ department/new\ department/" "${VCARD_DIR_A}/1" compare_vcard_dirs "${VCARD_DIR_A}" "${VCARD_DIR_1C}" success_exit Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_cal_fmod.sh ============================================================================== --- plugins/mozilla-sync/trunk/tests/blackbox_test_cal_fmod.sh Thu Jan 8 20:06:03 2009 (r5059) +++ plugins/mozilla-sync/trunk/tests/blackbox_test_cal_fmod.sh Fri Jan 9 11:36:29 2009 (r5060) @@ -29,7 +29,7 @@ # Modify a VEVENT # Fast sync it into Sunbird banner_step "Fast sync after add" -sed -i s/Location/New\ location/ "${VEVENT_DIR_1}/1" +sed -i.bak "s/Location/New\ location/" "${VEVENT_DIR_1}/1" msync_sync "${GROUP_NAME_1}" # Slow sync Sunbird to a new VEVENT directory in a new group @@ -40,7 +40,7 @@ create_msync_group_cal_file "${GROUP_NAME_1C}" 1 "${VEVENT_DIR_1C}" msync_sync "${GROUP_NAME_1C}" copy_dir VEVENT_DIR_A vevent_orig_for_compare "${VEVENT_DIR_BASE}" -sed -i s/Location/New\ location/ "${VEVENT_DIR_A}/1" +sed -i.bak "s/Location/New\ location/" "${VEVENT_DIR_A}/1" compare_vcard_dirs "${VEVENT_DIR_A}" "${VEVENT_DIR_1C}" success_exit Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in ============================================================================== --- plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in Thu Jan 8 20:06:03 2009 (r5059) +++ plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in Fri Jan 9 11:36:29 2009 (r5060) @@ -145,8 +145,18 @@ banner "Initializing test [${TEST_DESCRIPTION}]" myecho "SCRIPT_NAME [${SCRIPT_NAME}]" myecho "SRC_DIR [${SRC_DIR}]" -myecho "VALGRIND [${VALGRIND}]" - + myecho "VALGRIND [${VALGRIND}]" + KERNEL=`uname -s` + myecho "KERNEL [${KERNEL}]" + if [ "${KERNEL}" = 'FreeBSD' ]; then + MD5="md5" + else + MD5="md5sum" + fi + if ! ${MD5} < /dev/null > /dev/null; then + error_exit "${MD5} not found" $? "Could not find the executable ${MD5}" + fi + } @@ -161,7 +171,7 @@ myecho "TB_EXE [${TB_EXE}]" test -n "${TB_EXE}" || error_exit "Could not find Thunderbird" 1 - GRE_DIR=`grep moz_libdir "${TB_EXE}" | head -1 | cut -s -d "=" -f 2` + GRE_DIR=`grep moz_libdir "${TB_EXE}" | head -1 | cut -s -d "=" -f 2 | tr -d '"'` test -n "${GRE_DIR}" || GRE_DIR=`grep MOZ_DIST_LIB "${TB_EXE}" | head -1 | cut -s -d "=" -f 2 | tr -d '"'` test -n "${GRE_DIR}" || error_exit "Could not find GRE (Gecko Runtime Environment)" 1 myecho "GRE_DIR [${GRE_DIR}]" @@ -468,7 +478,7 @@ local MD5FILE="$2" touch "${MD5FILE}.tmp" find "${DIR}" -maxdepth 1 -type f | while read D; do - sort "$D" | grep -vE "DCREATED|LAST-MODIFIED" | md5sum >> "${MD5FILE}.tmp" + sort "$D" | grep -vE "DCREATED|LAST-MODIFIED" | ${MD5} >> "${MD5FILE}.tmp" done sort "${MD5FILE}.tmp" -o "${MD5FILE}" rm "${MD5FILE}.tmp" || true Modified: plugins/mozilla-sync/trunk/tests/unit_test_common.h ============================================================================== --- plugins/mozilla-sync/trunk/tests/unit_test_common.h Thu Jan 8 20:06:03 2009 (r5059) +++ plugins/mozilla-sync/trunk/tests/unit_test_common.h Fri Jan 9 11:36:29 2009 (r5060) @@ -35,6 +35,13 @@ #include <string.h> #include <glib.h> +// On FreeBSD we need unistd to define "mkdtemp" +// On FreeBSD we need libgen to define "basename" which is used in LOG +#if defined(__FreeBSD__) +#include <unistd.h> +#include <libgen.h> +#endif + #include <check.h> |
