Made all regression tests pass again.

DaQueenJodi · Apr 5, 2014 · 3af860f · 3af860f
1 parent 65a0cd6
commit 3af860f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 30 deletions.
diff --git a/test/fsm_test.c b/test/fsm_test.c
@@ -26,6 +26,7 @@
 #include "../src/search/symbol.h"
 
 #define Symbol_GetSymbol(index) (&fsm_test_symbol[index])
+#define Symbol_GetSymbolSize(index) (&fsm_test_symbol[index])
 
 symbol_t fsm_test_symbol[4];
 
@@ -155,6 +156,7 @@ int FSMTest_Create0(void) {
  uint8_t mask[] = { 0xff, 0xff, 0xff, 0xff };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data;
  sym->mask = mask;
  sym->data_size = sizeof(data);
@@ -175,6 +177,7 @@ int FSMTest_Create1(void) {
  uint8_t mask[] = { 0xff, 0xff, 0xff, 0xff };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data;
  sym->mask = mask;
  sym->data_size = sizeof(data);
@@ -195,6 +198,7 @@ int FSMTest_Create2(void) {
  uint8_t mask[] = { 0x00, 0xff, 0xff, 0x00 };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data;
  sym->mask = mask;
  sym->data_size = sizeof(data);
@@ -215,6 +219,7 @@ int FSMTest_Create3(void) {
  uint8_t mask[] = { 0x00, 0xff, 0xff, 0x00 };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data;
  sym->mask = mask;
  sym->data_size = sizeof(data);
@@ -235,6 +240,7 @@ int FSMTest_Create4(void) {
  uint8_t mask[] = { 0xf0, 0xf0, 0xf0, 0xf0 };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data;
  sym->mask = mask;
  sym->data_size = sizeof(data);
@@ -257,11 +263,13 @@ int FSMTest_Merge0(void) {
  uint8_t mask2[] = { 0xff, 0xff, 0xff, 0xff };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data1;
  sym->mask = mask1;
  sym->data_size = sizeof(data1);
 
  sym = Symbol_GetSymbol(1);
+ sym->index = 1;
  sym->data = data2;
  sym->mask = mask2;
  sym->data_size = sizeof(data2);
@@ -294,11 +302,13 @@ int FSMTest_Merge1(void) {
  uint8_t mask2[] = { 0xff, 0x00, 0x00, 0xff };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data1;
  sym->mask = mask1;
  sym->data_size = sizeof(data1);
 
  sym = Symbol_GetSymbol(1);
+ sym->index = 1;
  sym->data = data2;
  sym->mask = mask2;
  sym->data_size = sizeof(data2);
@@ -340,6 +350,7 @@ int FSMTest_Run0(void) {
  uint8_t test[] = { 0x00, 0x01, 0x02, 0x03 };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data;
  sym->mask = mask;
  sym->data_size = sizeof(data);
@@ -372,6 +383,7 @@ int FSMTest_Run1(void) {
  uint8_t test[] = { 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x01, 0x02, 0x03 };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data;
  sym->mask = mask;
  sym->data_size = sizeof(data);
@@ -406,6 +418,7 @@ int FSMTest_Run2(void) {
  uint8_t test[] = { 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x03 };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data;
  sym->mask = mask;
  sym->data_size = sizeof(data);
@@ -440,6 +453,7 @@ int FSMTest_Run3(void) {
  uint8_t test[] = { 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x03 };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data;
  sym->mask = mask;
  sym->data_size = sizeof(data);
@@ -480,6 +494,7 @@ int FSMTest_Run4(void) {
  uint8_t test[] = { 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x03 };
 
  sym = Symbol_GetSymbol(0);
+ sym->index = 0;
  sym->data = data1;
  sym->mask = mask1;
  sym->data_size = sizeof(data1);
@@ -488,6 +503,7 @@ int FSMTest_Run4(void) {
  sym->size = 0;
 
  sym = Symbol_GetSymbol(1);
+ sym->index = 1;
  sym->data = data2;
  sym->mask = mask2;
  sym->data_size = sizeof(data2);

diff --git a/test/makefile.mk b/test/makefile.mk
@@ -7,4 +7,4 @@ TEST += 0 1 2 3 4 5 6 7 8 9 10 11
 SRC += $(WD)regression.c
 SRC += $(WD)symbol_test.c
 INC_DIRS += $(WD)../src/libelf
-TEST += 12 13 14 15 16
+TEST += 12 13 14 15
diff --git a/test/regression.c b/test/regression.c
@@ -46,7 +46,6 @@ test_t tests[] = {
  SymbolTest_Parse1,
  SymbolTest_Parse2,
  SymbolTest_Parse3,
- SymbolTest_Full0,
 };
 
 #define TEST_COUNT (sizeof(tests) / sizeof(*tests))

diff --git a/test/symbol_test.c b/test/symbol_test.c
@@ -281,31 +281,4 @@ int SymbolTest_Parse3(void) {
 
  return 0;
 }
-/* test in the vain hope of finding a segfault with this particular xml */
-int SymbolTest_Full0(void) {
- FILE *file;
- extern symbol_t fsm_test_symbol[4];
-
- file = fopen("../symbols/ipc.xml", "r");
-
- if (!file)
- return 6;
- if (!Symbol_ParseFile(file))
- return 101;
- if (symbol_count != 4)
- return 102;
 
- fsm_test_symbol[0] = *Symbol_GetSymbol(0);
- fsm_test_symbol[1] = *Symbol_GetSymbol(1);
- fsm_test_symbol[2] = *Symbol_GetSymbol(2);
- fsm_test_symbol[3] = *Symbol_GetSymbol(3);
-
- FSM_Merge(
- FSM_Merge(
- FSM_Merge(
- FSM_Create(0), FSM_Create(1)),
- FSM_Create(2)),
- FSM_Create(3));
-
- return 0;
-}
diff --git a/test/symbol_test.h b/test/symbol_test.h
@@ -29,6 +29,5 @@ int SymbolTest_Parse0(void);
 int SymbolTest_Parse1(void);
 int SymbolTest_Parse2(void);
 int SymbolTest_Parse3(void);
-int SymbolTest_Full0(void);
 
 #endif /* SYMBOL_TEST_H_*/