[memcached] bradfitz, r389: more prep for release. making test pass...

commits at code.sixapart.com commits at code.sixapart.com
Sat Sep 9 20:25:18 UTC 2006


more prep for release.  making test passes on 64-bit

U   branches/memcached-1.1.x/Makefile.am
U   branches/memcached-1.1.x/t/expirations.t


Modified: branches/memcached-1.1.x/Makefile.am
===================================================================
--- branches/memcached-1.1.x/Makefile.am	2006-09-09 20:08:09 UTC (rev 388)
+++ branches/memcached-1.1.x/Makefile.am	2006-09-09 20:25:18 UTC (rev 389)
@@ -1,4 +1,4 @@
-bin_PROGRAMS = memcached-debug
+bin_PROGRAMS = memcached memcached-debug
 
 memcached_SOURCES = memcached.c slabs.c items.c assoc.c memcached.h
 memcached_debug_SOURCES = $(memcached_SOURCES)

Modified: branches/memcached-1.1.x/t/expirations.t
===================================================================
--- branches/memcached-1.1.x/t/expirations.t	2006-09-09 20:08:09 UTC (rev 388)
+++ branches/memcached-1.1.x/t/expirations.t	2006-09-09 20:25:18 UTC (rev 389)
@@ -11,10 +11,14 @@
 my $expire;
 
 sub wait_for_early_second {
-    use Time::HiRes ();
-    my $tsh = Time::HiRes::time();
-    my $ts = int($tsh);  # in case time was overloaded to be hires.
-    return if ($tsh - $ts) < 0.5;
+    my $have_hires = eval "use Time::HiRes (); 1";
+    if ($have_hires) {
+        my $tsh = Time::HiRes::time();
+        my $ts = int($tsh);
+        return if ($tsh - $ts) < 0.5;
+    }
+
+    my $ts = int(time());
     while (1) {
         my $t = int(time());
         return if $t != $ts;




More information about the memcached-commits mailing list