Changeset 3376

Timestamp:

06/19/08 09:23:51 (3 months ago)

Author:

JimLi

Message:

Add file helper functions for testing. This should replace ugly
system() call to improve the portability of the testsuite.
Also deal with the situation which the name of GNU diff is gdiff
in Solaris

osync_bool osync_testing_file_copy(const char *source, const char *dest)
osync_bool osync_testing_diff(const char *file1, const char *file2)

Files:

• trunk/CMakeLists.txt (modified) (1 diff)
• trunk/config.h.cmake (modified) (1 diff)
• trunk/tests/support.c (modified) (1 diff)
• trunk/tests/support.h (modified) (1 diff)

trunk/CMakeLists.txt

@@ -54 +54 @@
-ENDIF ( CHECK_FOUND AND OPENSYNC_UNITTESTS )
-
+IF ( CMAKE_SYSTEM_NAME MATCHES SunOS )
+        SET( HAVE_SOLARIS 1 )
+ENDIF (CMAKE_SYSTEM_NAME MATCHES SunOS )
+
-############################################## 
-

trunk/config.h.cmake

@@ -20 +20 @@
-
-#cmakedefine HAVE_FLOCK
+#cmakedefine HAVE_SOLARIS
-
-#define OPENSYNC_TESTDATA "${CMAKE_CURRENT_SOURCE_DIR}/tests/data"

trunk/tests/support.c

@@ -621 +621 @@
-}
-
+/*! @brief Copy files
+ *
+ * @param source source filename
+ * @param dest destination filename
+ * @returns TRUE on success, FALSE otherwise
+ *
+ */
+osync_bool osync_testing_file_copy(const char *source, const char *dest)
+{
+        gchar *cmd;
+        int ret;
+
+        cmd = g_strdup_printf("cp %s %s", source, dest);
+        ret = system(cmd);
+        g_free(cmd);
+
+        return ret;
+}
+
+/*! @brief Find differences between two files
+ *
+ * @param source source filename
+ * @param dest destination filename
+ * @returns TRUE on success, FALSE otherwise
+ *
+ */
+osync_bool osync_testing_diff(const char *file1, const char *file2)
+{
+        gchar *cmd;
+        int ret;
+
+        cmd = g_strdup_printf("test \"x`(" DIFF " -x \".*\" %s %s)`\" = \"x\"", file1, file2);
+        ret = system(cmd);
+        g_free(cmd);
+
+        return ret;
+}
+
-/*! @brief Creates a simple OSyncPluginConfig with a single resource.
- *         If config is not null the ressource information gets added.

trunk/tests/support.h

@@ -92 +92 @@
-osync_bool osync_testing_file_remove(const char *file);
-osync_bool osync_testing_file_chmod(const char *file, int mode);
+osync_bool osync_testing_file_copy(const char *source, const char *dest);
+osync_bool osync_testing_diff(const char *file1, const char *file2);
-
-/* Plugin config helper */
-OSyncPluginConfig *simple_plugin_config(OSyncPluginConfig *config, const char *path, const char *objformat, const char *format_config);
-
+/* gdiff is GNU diff in Solaris */
+#ifdef HAVE_SOLARIS
+#define DIFF "gdiff"
+#else
+#define DIFF "diff"
+#endif
+