Changeset 206

Timestamp:

01/29/05 15:56:52 (4 years ago)

Author:

abauer

Message:

Changed RELEASE file so it states to use buildtest.sh

Added all filter test again (removed the from test by
accident)

bumped version to 0.08

Location:

trunk

Files:

• RELEASE (modified) (1 diff)
• configure.in (modified) (1 diff)
• plugins/file-sync/src/file_sync.c (modified) (1 diff)
• src/opensync_filter.c (modified) (3 diffs)
• tests/check_filter.c (modified) (2 diffs)
• tests/check_multisync.c (modified) (1 diff)
• tests/support.c (modified) (1 diff)

trunk/RELEASE

@@ -8 +8 @@
  - increment the version number in configure.in
 
- - "make distcheck" (DO NOT just "make dist" - pass the check!)
+ - run ./buildtest.sh and pass tes test!
 
- - if make distcheck fails, fix it.
+ - if ./buildtest.sh fails, fix it.
 
  - Run "make check" again several times to try to see race conditions.
    You can also use the osyncstress tool.
 
- - once distcheck succeeds, "svn commit"
+ - once ./buildtest.sh succeeds, "svn commit"
 
  - if someone else made changes and the commit fails,
-   you have to "svn up" and run "make distcheck" again
+   you have to "svn up" and run ./buildtest.sh again
 
- - once the commit succeeds, "svn cp trunk branches/opensync-0.XX"
+ - once the commit succeeds, "svn cp trunk tags/opensync-0.XX"
 
  - upload the tarball to releases. make sure the version numbers are the same!

trunk/configure.in

@@ -3 +3 @@
 AC_PREREQ(2.58)
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(opensync, 0.07)
+AM_INIT_AUTOMAKE(opensync, 0.08)
 AM_CONFIG_HEADER(config.h)
 

trunk/plugins/file-sync/src/file_sync.c

@@ -136 +136 @@
         filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
         if (osync_member_get_slow_sync(fsinfo->member, "data")) {
-                osync_debug("FILE-SYNC", 1, "Setting slow sync");
+                osync_debug("FILE-SYNC", 3, "Setting slow sync");
                 osync_hashtable_set_slow_sync(fsinfo->hashtable, "data");
         }

trunk/src/opensync_filter.c

@@ -175 +175 @@
         g_assert(filter);
         g_assert(change);
-        osync_debug("OSFLT", 0, "Starting to invoke filter for change %s", change->uid);
+        osync_debug("OSFLT", 3, "Starting to invoke filter for change %s", change->uid);
         if (filter->sourcememberid && change->sourcemember && filter->sourcememberid != change->sourcemember->id)
                 return OSYNC_FILTER_IGNORE;
@@ -192 +192 @@
         }
         
-        osync_debug("OSFLT", 0, "Change %s passed the filter!", change->uid);
+        osync_debug("OSFLT", 3, "Change %s passed the filter!", change->uid);
         //We passed the filter. Now we can return the action
         if (!filter->hook)
@@ -206 +206 @@
         GList *f = NULL;
         int ret = TRUE;
-        osync_debug("OSFLT", 0, "Checking if change %s is allowed for member %lli. Filters to invoke: %i", change->uid, destmember->id, g_list_length(filters));
+        osync_debug("OSFLT", 3, "Checking if change %s is allowed for member %lli. Filters to invoke: %i", change->uid, destmember->id, g_list_length(filters));
         for (f = filters; f; f = f->next) {
                 OSyncFilter *filter = f->data;

trunk/tests/check_filter.c

@@ -298 +298 @@
 {
         Suite *s = suite_create("Filter");
-        Suite *s2 = suite_create("Filter");
+        //Suite *s2 = suite_create("Filter");
         
         create_case(s, "filter_setup", filter_setup);
@@ -306 +306 @@
         create_case(s, "filter_save_and_load", filter_save_and_load);
         create_case(s, "filter_sync_vcard_only", filter_sync_vcard_only);
-        create_case(s2, "filter_destobjtype_delete", filter_destobjtype_delete);
-        
-        return s2;
+        create_case(s, "filter_destobjtype_delete", filter_destobjtype_delete);
+        
+        return s;
 }
 

trunk/tests/check_multisync.c

@@ -2140 +2140 @@
 {
         Suite *s = suite_create("Multisync");
+        //Suite *s2 = suite_create("Multisync");
         create_case(s, "multisync_easy_new", multisync_easy_new);
         create_case(s, "multisync_dual_new", multisync_dual_new);

trunk/tests/support.c

@@ -191 +191 @@
         mark_point();
         OSyncMember *member = osync_member_from_id(group, memberid);
+        mark_point();
         OSyncHashTable *table = osync_hashtable_new();
         mark_point();
     osync_hashtable_load(table, member);
+    mark_point();
     fail_unless(osync_hashtable_num_entries(table) == entries, NULL);
     return table;