[Box Backup-dev] COMMIT r218 - in box/chris/win32/merge/07-win32-fixes: . test/crypto

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2005-12-12 23:40:49 +0000 (Mon, 12 Dec 2005)
New Revision: 218

Modified:
   box/chris/win32/merge/07-win32-fixes/modules.txt
   box/chris/win32/merge/07-win32-fixes/runtest.pl
   box/chris/win32/merge/07-win32-fixes/test/crypto/testcrypto.cpp
Log:
* modules.txt
- Disabled test/basicserver on mingw32 (requires fork() and signals)

* runtest.pl
- Properly skip tests for cross-compiled targets

* test/crypto/testcrypto.cpp
- Use memset instead of non-portable bzero


Modified: box/chris/win32/merge/07-win32-fixes/modules.txt
===================================================================
--- box/chris/win32/merge/07-win32-fixes/modules.txt	2005-12-12 23:03:11 UTC (rev 217)
+++ box/chris/win32/merge/07-win32-fixes/modules.txt	2005-12-12 23:40:49 UTC (rev 218)
@@ -19,11 +19,11 @@
 lib/win32		lib/server
 lib/compress
 test/common		lib/win32
-test/crypto		lib/crypto
-test/compress		lib/compress
-test/basicserver	lib/server
+test/crypto		lib/crypto	lib/win32
+test/compress		lib/compress	lib/win32
 
 OMIT:mingw32
+test/basicserver	lib/server	lib/win32
 OMIT:CYGWIN
 test/raidfile		lib/raidfile
 END-OMIT

Modified: box/chris/win32/merge/07-win32-fixes/runtest.pl
===================================================================
--- box/chris/win32/merge/07-win32-fixes/runtest.pl	2005-12-12 23:03:11 UTC (rev 217)
+++ box/chris/win32/merge/07-win32-fixes/runtest.pl	2005-12-12 23:40:49 UTC (rev 218)
@@ -38,7 +38,7 @@
 		next if m/\AEND-OMIT/;
 		if(m/\AOMIT:(.+)/)
 		{
-			if($1 eq $build_os)
+			if($1 eq $build_os or $1 eq $target_os)
 			{
 				while(<MODULES>)
 				{

Modified: box/chris/win32/merge/07-win32-fixes/test/crypto/testcrypto.cpp
===================================================================
--- box/chris/win32/merge/07-win32-fixes/test/crypto/testcrypto.cpp	2005-12-12 23:03:11 UTC (rev 217)
+++ box/chris/win32/merge/07-win32-fixes/test/crypto/testcrypto.cpp	2005-12-12 23:40:49 UTC (rev 218)
@@ -43,7 +43,7 @@
 	}
 }
 
-#define ZERO_BUFFER(x) ::bzero(x, sizeof(x));
+#define ZERO_BUFFER(x) ::memset(x, 0, sizeof(x));
 
 template<typename CipherType, int BLOCKSIZE>
 void test_cipher()