Merge branch 'fix-wrong-handle-type' into 'master'

Fix up "wrong" handle type from char* to uint64_t Following from the NBD handle comparison simplifications. See merge request !25
Merge branch 'fix-unsigned-longs-in-bitset-test' into 'master'
2016-10-07 10:20:35 +01:00 · 2016-10-07 10:20:08 +01:00 · 2016-10-07 09:59:24 +01:00 · 2016-10-07 09:57:09 +01:00 · 2016-10-06 21:42:52 +01:00 · 2016-10-06 21:22:53 +01:00
4 changed files with 10 additions and 6 deletions
--- a/src/server/serve.c
+++ b/src/server/serve.c
@@ -255,7 +255,7 @@ int tryjoin_client_thread( struct client_tbl_entry *entry, int (*joinfunc)(pthre
 			debug("nbd thread %016x exited (%s) with status %ld",
 					entry->thread,
 					s_client_address,
-					(uint64_t)status);
+					(uintptr_t)status);
 			client_destroy( entry->client );
 			entry->client = NULL;
 			entry->thread = 0;
--- a/tests/acceptance/test_happy_path.rb
+++ b/tests/acceptance/test_happy_path.rb
@@ -115,6 +115,11 @@ class TestHappyPath < Test::Unit::TestCase


  def test_write_to_high_block
+		# 
+		# This test does not work on 32 bit platforms.
+		#
+		skip("Not relevant on 32-bit platforms") if ( ["a"].pack("p").size < 8 )
+
    # Create a large file, then try to write to somewhere after the 2G boundary
    @env.truncate1 "4G"
    @env.serve1
--- a/tests/unit/check_bitset.c
+++ b/tests/unit/check_bitset.c
@@ -59,7 +59,7 @@ END_TEST
 START_TEST(test_bit_ranges)
 {
 	bitfield_word_t buffer[BIT_WORDS_FOR_SIZE(4160)];
-	uint64_t  *longs = (unsigned long*) buffer;
+	uint64_t  *longs = (uint64_t *) buffer;
 	uint64_t i;

 	memset(buffer, 0, 4160);
@@ -67,9 +67,9 @@ START_TEST(test_bit_ranges)
 	for (i=0; i<64; i++) {
 		bit_set_range(buffer, i*64, i);
 		fail_unless(
-			longs[i] == (1UL<<i)-1,
+			longs[i] == (1ULL<<i)-1,
 			"longs[%ld] = %lx SHOULD BE %lx",
-			i, longs[i], (1L<<i)-1
+			i, longs[i], (1ULL<<i)-1
 		);

 		fail_unless(longs[i+1] == 0, "bit_set_range overshot at i=%d", i);
--- a/tests/unit/check_readwrite.c
+++ b/tests/unit/check_readwrite.c
@@ -46,8 +46,7 @@ void * responder( void *respond_uncast )
 	struct respond * resp = (struct respond *) respond_uncast;
 	int sock_fd = resp->sock_fds[1];
 	struct nbd_request_raw request_raw;
-	char wrong_handle[] = "WHOOPSIE";
-
+	uint64_t wrong_handle = 0x80;

 	if( fd_read_request( sock_fd, &request_raw ) == -1){
 		fprintf(stderr, "Problem with fd_read_request\n");
Author	SHA1	Message	Date
James Carter	b4cb2d9240	Merge branch 'fix-wrong-handle-type' into 'master' Fix up "wrong" handle type from char* to uint64_t Following from the NBD handle comparison simplifications. See merge request !25	2016-10-07 10:20:35 +01:00
James Carter	1efb7bada6	Merge branch 'fix-unsigned-longs-in-bitset-test' into 'master' fix check_bitset test on 32-bit platforms The use of `unsigned long` and `UL` suffices caused this test to fail on 32 bit platforms, where these are just 4, not 8 bits long. ``` tests/unit/check_bitset.c:73:F:bit:test_bit_ranges:0: longs[32] = 0 SHOULD BE ffffffff ``` See merge request !24	2016-10-07 10:20:08 +01:00
James Carter	6bc2a4c0b9	Merge branch 'fix-cast-from-pointer-to-wrong-size-integer-in-serve' into 'master' This fixes the compiler warning pointer-to-int-cast in serve.c ``` In file included from src/server/bitset.h:4:0, from src/server/mirror.h:8, from src/server/flexnbd.h:5, from src/server/serve.h:8, from src/server/serve.c:1: src/server/serve.c: In function 'tryjoin_client_thread': src/server/serve.c:258:6: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] (uint64_t)status); ^ ``` See merge request !23	2016-10-07 09:59:24 +01:00
James Carter	59de76c50c	Merge branch 'skip-large-file-test-on-i386' into 'master' Skip large file test on 32-bit platforms This test cannot run on 32-bit machines as they cannot access files large than 2G. Makes flexnbd on 32-bit a bit useless really.. See merge request !22	2016-10-07 09:57:09 +01:00
Patrick J Cherry	209da655b3	Skip large file test on 32-bit platforms This test cannot run on 32-bit machines as they cannot access files large than 2G. Makes flexnbd on 32-bit a bit useless really..	2016-10-06 21:42:52 +01:00
Patrick J Cherry	52b45e6b40	fix check_bitset test on 32-bit platforms The use of `unsigned long` and `UL` suffices caused this test to fail on 32 bit platforms, where these are just 4, not 8 bits long. ``` tests/unit/check_bitset.c:73:F:bit:test_bit_ranges:0: longs[32] = 0 SHOULD BE ffffffff ```	2016-10-06 21:22:53 +01:00
Patrick J Cherry	d279eb7570	Fix up "wrong" handle type from char* to uint64_t Following from the NBD handle comparison simplifications.	2016-10-06 21:19:15 +01:00
Patrick J Cherry	c07df76ede	This fixes the compiler warning pointer-to-int-cast in serve.c ``` In file included from src/server/bitset.h:4:0, from src/server/mirror.h:8, from src/server/flexnbd.h:5, from src/server/serve.h:8, from src/server/serve.c:1: src/server/serve.c: In function 'tryjoin_client_thread': src/server/serve.c:258:6: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] (uint64_t)status); ^ ```	2016-10-06 21:16:07 +01:00
James Carter	e19d005636	Merge branch '26-fix-function-definition' into 'master' OK removed the cast and fixed the function def in the test This should definitely clear the warning. Closes #26 See merge request !21	2016-10-06 15:59:57 +01:00