From 1b0d7eb4e147da838f10065e495c203cd2d8d4bd Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Thu, 16 May 2013 17:04:30 +0200
Subject: [PATCH] Make test_labcomm_basic_type_encoding compile on 32-bit
platform...
---
lib/c/test/test_labcomm_basic_type_encoding.c | 101 +++++++++---------
1 file changed, 50 insertions(+), 51 deletions(-)
diff --git a/lib/c/test/test_labcomm_basic_type_encoding.c b/lib/c/test/test_labcomm_basic_type_encoding.c
index f042051..bfb1566 100644
--- a/lib/c/test/test_labcomm_basic_type_encoding.c
+++ b/lib/c/test/test_labcomm_basic_type_encoding.c
@@ -1,4 +1,5 @@
#include <stdint.h>
+#include <inttypes.h>
#include <string.h>
#include "labcomm_private.h"
@@ -39,20 +40,18 @@ static labcomm_decoder_t decoder = {
.on_error = NULL,
};
-typedef unsigned int packed32;
-typedef unsigned char boolean;
-typedef unsigned char byte;
+typedef uint32_t packed32;
-#define TEST_WRITE_READ(type, format, value, expect_count, expect_bytes) \
+#define TEST_WRITE_READ(type, ltype, format, value, expect_count, expect_bytes) \
{ \
type decoded; \
line = __LINE__; \
encoder.writer.pos = 0; \
- labcomm_encode_##type(&encoder, value); \
- writer_assert(#type, expect_count, (uint8_t*)expect_bytes); \
+ labcomm_encode_##ltype(&encoder, value); \
+ writer_assert(#ltype, expect_count, (uint8_t*)expect_bytes); \
decoder.reader.count = encoder.writer.pos; \
decoder.reader.pos = 0; \
- decoded = labcomm_decode_##type(&decoder); \
+ decoded = labcomm_decode_##ltype(&decoder); \
if (decoded != value) { \
fprintf(stderr, "Decode error" format " != " format " @%s:%d \n", value, decoded, \
__FILE__, __LINE__); \
@@ -88,50 +87,50 @@ static void writer_assert(char *type,
int main(void)
{
- TEST_WRITE_READ(packed32, "%d", 0x0, 1, "\x00");
- TEST_WRITE_READ(packed32, "%d", 0x7f, 1, "\x7f");
- TEST_WRITE_READ(packed32, "%d", 0x80, 2, "\x81\x00");
- TEST_WRITE_READ(packed32, "%d", 0x3fff, 2, "\xff\x7f");
- TEST_WRITE_READ(packed32, "%d", 0x4000, 3, "\x81\x80\x00");
- TEST_WRITE_READ(packed32, "%d", 0x1fffff, 3, "\xff\xff\x7f");
- TEST_WRITE_READ(packed32, "%d", 0x200000, 4, "\x81\x80\x80\x00");
- TEST_WRITE_READ(packed32, "%d", 0xfffffff, 4, "\xff\xff\xff\x7f");
- TEST_WRITE_READ(packed32, "%d", 0x10000000, 5, "\x81\x80\x80\x80\x00");
- TEST_WRITE_READ(packed32, "%d", 0xffffffff, 5, "\x8f\xff\xff\xff\x7f");
- TEST_WRITE_READ(boolean, "%d", 0, 1, "\x00");
- TEST_WRITE_READ(boolean, "%d", 1, 1, "\x01");
- TEST_WRITE_READ(byte, "%d", 0, 1, "\x00");
- TEST_WRITE_READ(byte, "%d", 1, 1, "\x01");
- TEST_WRITE_READ(byte, "%d", 0xff, 1, "\xff");
- TEST_WRITE_READ(short, "%d", 0, 2, "\x00\x00");
- TEST_WRITE_READ(short, "%d", 0x7fff, 2, "\x7f\xff");
- TEST_WRITE_READ(short, "%d", -1, 2, "\xff\xff");
- TEST_WRITE_READ(int, "%d", 0, 4, "\x00\x00\x00\x00");
- TEST_WRITE_READ(int, "%d", 0x7fffffff, 4, "\x7f\xff\xff\xff");
- TEST_WRITE_READ(int, "%d", -1, 4, "\xff\xff\xff\xff");
- TEST_WRITE_READ(long, "%ld", 0L, 8, "\x00\x00\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(long, "%ld", 0x7fffffffffffffffL, 8, "\x7f\xff\xff\xff\xff\xff\xff\xff");
- TEST_WRITE_READ(long, "%ld", -1L, 8, "\xff\xff\xff\xff\xff\xff\xff\xff");
- TEST_WRITE_READ(float, "%f", 0.0, 4, "\x00\x00\x00\x00");
- TEST_WRITE_READ(float, "%f", 1.0, 4, "\x3f\x80\x00\x00");
- TEST_WRITE_READ(float, "%f", 2.0, 4, "\x40\x00\x00\x00");
- TEST_WRITE_READ(float, "%f", 0.5, 4, "\x3f\x00\x00\x00");
- TEST_WRITE_READ(float, "%f", 0.25, 4, "\x3e\x80\x00\x00");
- TEST_WRITE_READ(float, "%f", -0.0, 4, "\x80\x00\x00\x00");
- TEST_WRITE_READ(float, "%f", -1.0, 4, "\xbf\x80\x00\x00");
- TEST_WRITE_READ(float, "%f", -2.0, 4, "\xc0\x00\x00\x00");
- TEST_WRITE_READ(float, "%f", -0.5, 4, "\xbf\x00\x00\x00");
- TEST_WRITE_READ(float, "%f", -0.25, 4, "\xbe\x80\x00\x00");
- TEST_WRITE_READ(double, "%f", 0.0, 8, "\x00\x00\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(double, "%f", 1.0, 8, "\x3f\xf0\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(double, "%f", 2.0, 8, "\x40\x00\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(double, "%f", 0.5, 8, "\x3f\xe0\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(double, "%f", 0.25, 8, "\x3f\xd0\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(double, "%f", -0.0, 8, "\x80\x00\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(double, "%f", -1.0, 8, "\xbf\xf0\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(double, "%f", -2.0, 8, "\xc0\x00\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(double, "%f", -0.5, 8, "\xbf\xe0\x00\x00\x00\x00\x00\x00");
- TEST_WRITE_READ(double, "%f", -0.25, 8, "\xbf\xd0\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0x0, 1, "\x00");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0x7f, 1, "\x7f");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0x80, 2, "\x81\x00");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0x3fff, 2, "\xff\x7f");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0x4000, 3, "\x81\x80\x00");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0x1fffff, 3, "\xff\xff\x7f");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0x200000, 4, "\x81\x80\x80\x00");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0xfffffff, 4, "\xff\xff\xff\x7f");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0x10000000, 5, "\x81\x80\x80\x80\x00");
+ TEST_WRITE_READ(packed32, packed32, "%d", 0xffffffff, 5, "\x8f\xff\xff\xff\x7f");
+ TEST_WRITE_READ(uint8_t, boolean, "%d", 0, 1, "\x00");
+ TEST_WRITE_READ(uint8_t, boolean, "%d", 1, 1, "\x01");
+ TEST_WRITE_READ(uint8_t, byte, "%d", 0, 1, "\x00");
+ TEST_WRITE_READ(uint8_t, byte, "%d", 1, 1, "\x01");
+ TEST_WRITE_READ(uint8_t, byte, "%d", 0xff, 1, "\xff");
+ TEST_WRITE_READ(int16_t, short, "%d", 0, 2, "\x00\x00");
+ TEST_WRITE_READ(int16_t, short, "%d", 0x7fff, 2, "\x7f\xff");
+ TEST_WRITE_READ(int16_t, short, "%d", -1, 2, "\xff\xff");
+ TEST_WRITE_READ(int32_t, int, "%d", 0, 4, "\x00\x00\x00\x00");
+ TEST_WRITE_READ(int32_t, int, "%d", 0x7fffffff, 4, "\x7f\xff\xff\xff");
+ TEST_WRITE_READ(int32_t, int, "%d", -1, 4, "\xff\xff\xff\xff");
+ TEST_WRITE_READ(int64_t, long, "%" PRId64, INT64_C(0), 8, "\x00\x00\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(int64_t, long, "%" PRId64, INT64_C(0x7fffffffffffffff), 8, "\x7f\xff\xff\xff\xff\xff\xff\xff");
+ TEST_WRITE_READ(int64_t, long, "%" PRId64, INT64_C(-1), 8, "\xff\xff\xff\xff\xff\xff\xff\xff");
+ TEST_WRITE_READ(float, float, "%f", 0.0, 4, "\x00\x00\x00\x00");
+ TEST_WRITE_READ(float, float, "%f", 1.0, 4, "\x3f\x80\x00\x00");
+ TEST_WRITE_READ(float, float, "%f", 2.0, 4, "\x40\x00\x00\x00");
+ TEST_WRITE_READ(float, float, "%f", 0.5, 4, "\x3f\x00\x00\x00");
+ TEST_WRITE_READ(float, float, "%f", 0.25, 4, "\x3e\x80\x00\x00");
+ TEST_WRITE_READ(float, float, "%f", -0.0, 4, "\x80\x00\x00\x00");
+ TEST_WRITE_READ(float, float, "%f", -1.0, 4, "\xbf\x80\x00\x00");
+ TEST_WRITE_READ(float, float, "%f", -2.0, 4, "\xc0\x00\x00\x00");
+ TEST_WRITE_READ(float, float, "%f", -0.5, 4, "\xbf\x00\x00\x00");
+ TEST_WRITE_READ(float, float, "%f", -0.25, 4, "\xbe\x80\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", 0.0, 8, "\x00\x00\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", 1.0, 8, "\x3f\xf0\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", 2.0, 8, "\x40\x00\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", 0.5, 8, "\x3f\xe0\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", 0.25, 8, "\x3f\xd0\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", -0.0, 8, "\x80\x00\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", -1.0, 8, "\xbf\xf0\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", -2.0, 8, "\xc0\x00\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", -0.5, 8, "\xbf\xe0\x00\x00\x00\x00\x00\x00");
+ TEST_WRITE_READ(double, double, "%f", -0.25, 8, "\xbf\xd0\x00\x00\x00\x00\x00\x00");
fprintf(stderr, "%s succeded\n", __FILE__);
return 0;
}
--
GitLab