From d1aa0fff8042820894e0efb3988b18d5c2ef3bbe Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 13 11月 2015 06:20:03 +0800
Subject: [PATCH] Resolve #65: Infinite loop with non ASCII character
---
libscpi/test/test_fifo.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/libscpi/test/test_fifo.c b/libscpi/test/test_fifo.c
index bfe7cad..c31cc26 100644
--- a/libscpi/test/test_fifo.c
+++ b/libscpi/test/test_fifo.c
@@ -9,22 +9,22 @@
#include <stdlib.h>
#include "CUnit/Basic.h"
-#include "scpi/fifo.h"
+#include "../src/fifo_private.h"
/*
* CUnit Test Suite
*/
-int init_suite(void) {
+static int init_suite(void) {
return 0;
}
-int clean_suite(void) {
+static int clean_suite(void) {
return 0;
}
-void testFifo() {
- fifo_t fifo;
+static void testFifo() {
+ scpi_fifo_t fifo;
fifo_init(&fifo);
int16_t value;
@@ -76,12 +76,13 @@
CU_ASSERT_TRUE(fifo_remove(&fifo, &value));
CU_ASSERT_EQUAL(value, 5);
TEST_FIFO_COUNT(0);
-
+
CU_ASSERT_FALSE(fifo_remove(&fifo, &value));
TEST_FIFO_COUNT(0);
}
int main() {
+ unsigned int result;
CU_pSuite pSuite = NULL;
/* Initialize the CUnit test registry */
@@ -104,6 +105,7 @@
/* Run all tests using the CUnit Basic interface */
CU_basic_set_mode(CU_BRM_VERBOSE);
CU_basic_run_tests();
+ result = CU_get_number_of_tests_failed();
CU_cleanup_registry();
- return CU_get_error();
+ return result ? result : CU_get_error();
}
--
Gitblit v1.9.1