From 6cb0bbb9494b908be000d331d0e7068bb6ae9ee7 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 22 Feb 2007 16:37:12 +0000
Subject: Tweaks for W32

---
 tests/ChangeLog   |  5 +++++
 tests/Makefile.am |  9 ++++++++-
 tests/pkbench.c   | 10 ++++++++++
 tests/tsexp.c     |  3 ++-
 4 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 8e619fd4..4dd2da24 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-22  Werner Koch  <wk@g10code.com>
+
+	* Makefile.am (TESTS) [W32]: Removed pkbench for now.
+	* pkbench.c (benchmark): Fixed for W32.
+
 2007-02-21  Werner Koch  <wk@g10code.com>
 
 	* hmac.c (check_one_mac): Make pointer args const.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ecaa6d8c..6539d885 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +19,14 @@
 ## Process this file with automake to produce Makefile.in
 
 TESTS = t-mpi-bit prime register ac ac-schemes ac-data basic \
-        tsexp keygen pubkey benchmark pkbench hmac keygrip
+        tsexp keygen pubkey benchmark hmac keygrip
+
+# pkbench uses mmap for no good reason.  Needs to be fixed.  Code for
+# this can be found in libksba/tests.
+if !HAVE_W32_SYSTEM
+TESTS += pkbench 
+endif
+
 
 # Need to include ../src in addition to top_srcdir because gcrypt.h is
 # a built header.
diff --git a/tests/pkbench.c b/tests/pkbench.c
index 372fa0c9..5ce9b0e2 100644
--- a/tests/pkbench.c
+++ b/tests/pkbench.c
@@ -27,7 +27,9 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
+#ifndef HAVE_W32_SYSTEM
 #include <sys/times.h>
+#endif HAVE_W32_SYSTEM
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
@@ -52,16 +54,24 @@ benchmark (work_t worker, context_t context)
   struct tms timer;
   int ret = 0;
 
+#ifdef HAVE_W32_SYSTEM
+  timer_start = clock ();
+#else
   times (&timer);
   timer_start = timer.tms_utime;
+#endif
   for (i = 0; i < loop; i++)
     {
       ret = (*worker) (context, (i + 1) == loop);
       if (! ret)
 	break;
     }
+#ifdef HAVE_W32_SYSTEM
+  timer_stop = clock ();
+#else
   times (&timer);
   timer_stop = timer.tms_utime;
+#endif
 
   if (ret)
     printf ("%.0f ms\n",
diff --git a/tests/tsexp.c b/tests/tsexp.c
index 1d71208e..530aa4c8 100644
--- a/tests/tsexp.c
+++ b/tests/tsexp.c
@@ -248,7 +248,8 @@ canon_len (void)
   info ("checking canoncial length test function\n");
   for (idx=0; values[idx].text; idx++)
     {
-      n = gcry_sexp_canon_len (values[idx].text, values[idx].textlen, 
+      n = gcry_sexp_canon_len ((const unsigned char*)values[idx].text,
+                               values[idx].textlen, 
                                &erroff, &errcode);
       
       if (n && n == values[idx].expected)
-- 
cgit v1.2.1