Index: uspace/app/tester/Makefile =================================================================== --- uspace/app/tester/Makefile (revision 9e953bdaafd063445667cfbe013a1cd5067095b1) +++ uspace/app/tester/Makefile (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) @@ -29,8 +29,11 @@ USPACE_PREFIX = ../.. +LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBEXT2_PREFIX)/libext2.a +EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX) BINARY = tester SOURCES = \ tester.c \ + util.c \ thread/thread1.c \ print/print1.c \ @@ -52,5 +55,6 @@ devs/devman1.c \ hw/misc/virtchar1.c \ - hw/serial/serial1.c + hw/serial/serial1.c \ + libext2/libext2_1.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/tester/libext2/libext2_1.c =================================================================== --- uspace/app/tester/libext2/libext2_1.c (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) +++ uspace/app/tester/libext2/libext2_1.c (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2005 Jakub Vana + * Copyright (c) 2005 Jakub Jermar + * Copyright (c) 2011 Martin Sucha + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include "../tester.h" +#include "../util.h" +#include +#include + +static ext2_superblock_t *fake_superblock1() +{ + uint8_t *buf; + int i; + + buf = malloc(EXT2_SUPERBLOCK_SIZE); + if (buf == NULL) { + return NULL; + } + + for (i = 0; i < EXT2_SUPERBLOCK_SIZE; i++) { + buf[i] = i % 256; + } + + return (ext2_superblock_t *) buf; +} + +const char *test_libext2_1(void) +{ + ext2_superblock_t *fake1; + + TPRINTF("Testing libext2 superblock getters...\n"); + TPRINTF("Simple test for correct position and byte order\n"); + + fake1 = fake_superblock1(); + if (fake1 == NULL) { + return "Failed allocating memory for test superblock 1"; + } + + ASSERT_EQ_32(0x03020100, ext2_superblock_get_total_inode_count(fake1), + "Failed getting total inode count"); + ASSERT_EQ_32(0x07060504, ext2_superblock_get_total_block_count(fake1), + "Failed getting total block count"); + ASSERT_EQ_32(0x0B0A0908, ext2_superblock_get_reserved_block_count(fake1), + "Failed getting reserved block count"); + ASSERT_EQ_32(0x0F0E0D0C, ext2_superblock_get_free_block_count(fake1), + "Failed getting free block count"); + ASSERT_EQ_32(0x13121110, ext2_superblock_get_free_inode_count(fake1), + "Failed getting free inode count"); + ASSERT_EQ_32(0x17161514, ext2_superblock_get_first_block(fake1), + "Failed getting first block number"); + ASSERT_EQ_32(0x1B1A1918, ext2_superblock_get_block_size_log2(fake1), + "Failed getting log block size"); + ASSERT_EQ_32(0x1F1E1D1C, ext2_superblock_get_fragment_size_log2(fake1), + "Failed getting log fragment size"); + ASSERT_EQ_32(0x23222120, ext2_superblock_get_blocks_per_group(fake1), + "Failed getting blocks per group"); + ASSERT_EQ_32(0x27262524, ext2_superblock_get_fragments_per_group(fake1), + "Failed getting fragments per group"); + ASSERT_EQ_32(0x2B2A2928, ext2_superblock_get_inodes_per_group(fake1), + "Failed getting inodes per group"); + ASSERT_EQ_16(0x3938, ext2_superblock_get_magic(fake1), + "Failed getting magic number"); + ASSERT_EQ_16(0x3B3A, ext2_superblock_get_state(fake1), + "Failed getting state"); + ASSERT_EQ_16(0x3F3E, ext2_superblock_get_rev_minor(fake1), + "Failed getting minor revision number"); + ASSERT_EQ_32(0x4B4A4948, ext2_superblock_get_os(fake1), + "Failed getting OS"); + ASSERT_EQ_32(0x4F4E4D4C, ext2_superblock_get_rev_major(fake1), + "Failed getting major revision number"); + ASSERT_EQ_32(0x57565554, ext2_superblock_get_first_inode(fake1), + "Failed getting first inode number"); + ASSERT_EQ_16(0x5958, ext2_superblock_get_inode_size(fake1), + "Failed getting size"); + ASSERT_EQ_8(0x68, fake1->uuid[0], "UUID position is incorrect"); + ASSERT_EQ_8(0x78, fake1->volume_name[0], + "Volume name position is incorrect"); + + return NULL; +} Index: uspace/app/tester/libext2/libext2_1.def =================================================================== --- uspace/app/tester/libext2/libext2_1.def (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) +++ uspace/app/tester/libext2/libext2_1.def (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) @@ -0,0 +1,6 @@ +{ + "libext2_1", + "Superblock getters test", + &test_libext2_1, + true +}, Index: uspace/app/tester/tester.c =================================================================== --- uspace/app/tester/tester.c (revision 9e953bdaafd063445667cfbe013a1cd5067095b1) +++ uspace/app/tester/tester.c (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) @@ -65,4 +65,5 @@ #include "hw/serial/serial1.def" #include "hw/misc/virtchar1.def" +#include "libext2/libext2_1.def" #include "devs/devman1.def" {NULL, NULL, NULL, false} Index: uspace/app/tester/tester.h =================================================================== --- uspace/app/tester/tester.h (revision 9e953bdaafd063445667cfbe013a1cd5067095b1) +++ uspace/app/tester/tester.h (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) @@ -81,4 +81,5 @@ extern const char *test_serial1(void); extern const char *test_virtchar1(void); +extern const char *test_libext2_1(void); extern const char *test_devman1(void); Index: uspace/app/tester/util.c =================================================================== --- uspace/app/tester/util.c (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) +++ uspace/app/tester/util.c (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2011 Martin Sucha + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup tester + * @{ + */ +/** + * @file + */ + +#include "util.h" +#undef ASSERT_EQ_FN_DEF +#define ASSERT_EQ_FN_DEF(type, fmt, fmtx) \ +bool assert_eq_fn_##type(type exp, type act, const char *act_desc) \ +{ \ + if (exp != act) { \ + fprintf(stderr, "Expected %s to be %" fmt " (0x%" fmtx "),"\ + " but was %" fmt " (0x%" fmtx ") \n", \ + act_desc, exp, exp, act, act); \ + } \ + return exp != act; \ +} + +#include "util_functions.def" + + +/** @} + */ Index: uspace/app/tester/util.h =================================================================== --- uspace/app/tester/util.h (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) +++ uspace/app/tester/util.h (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2011 Martin Sucha + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup tester + * @{ + */ +/** @file + */ + +#ifndef UTIL_H_ +#define UTIL_H_ + +#include +#include "tester.h" + +#define ASSERT_EQ_FN_DEF(type, fmt, fmtx) \ +extern bool assert_eq_fn_##type(type, type, const char *); + +#include "util_functions.def" + +#define ASSERT_EQ_64(exp, act, msg) \ +{if (assert_eq_fn_uint64_t(exp, act, #act)) {return msg;}} + +#define ASSERT_EQ_32(exp, act, msg) \ +{if (assert_eq_fn_uint32_t(exp, act, #act)) {return msg;}} + +#define ASSERT_EQ_16(exp, act, msg) \ +{if (assert_eq_fn_uint16_t(exp, act, #act)) {return msg;}} + +#define ASSERT_EQ_8(exp, act, msg) \ +{if (assert_eq_fn_uint8_t(exp, act, #act)) {return msg;}} + +#endif + +/** @} + */ Index: uspace/app/tester/util_functions.def =================================================================== --- uspace/app/tester/util_functions.def (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) +++ uspace/app/tester/util_functions.def (revision 694ca93fa1697ba7bdc8a18a613b9b84a0449ca3) @@ -0,0 +1,4 @@ +ASSERT_EQ_FN_DEF(uint8_t, "hhu", "hhx") +ASSERT_EQ_FN_DEF(uint16_t, "hu", "hx") +ASSERT_EQ_FN_DEF(uint32_t, "u", "x") +ASSERT_EQ_FN_DEF(uint64_t, PRIu64, PRIx64)