[Forensics-changes] [yara] 279/368: Fix alignment tests

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.5.0
in repository yara.

commit 2cc68242ec63e2f683ab0fc75ab7b9c47de84f03
Author: plusvic <plusvic at gmail.com>
Date:   Mon May 16 12:56:33 2016 +0200

    Fix alignment tests
---
 tests/test-alignment.c | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/tests/test-alignment.c b/tests/test-alignment.c
index 6f9fbcb..3a2c9e6 100644
--- a/tests/test-alignment.c
+++ b/tests/test-alignment.c
@@ -85,17 +85,17 @@ int main (int argc, char **argv)
   CHECK_OFFSET(YR_STRING, 36, chain_gap_max);
   CHECK_OFFSET(YR_STRING, 40, fixed_offset);
 
-  CHECK_SIZE(YR_RULE, 8 + 4*MAX_THREADS + 40
+  CHECK_SIZE(YR_RULE, 8 + 4 * MAX_THREADS + 40
 #            ifdef PROFILING_ENABLED
              + 8
 #            endif
              );
-  CHECK_OFFSET(YR_RULE, 4,                      t_flags);
-  CHECK_OFFSET(YR_RULE, 8 + 4*MAX_THREADS,      identifier);
-  CHECK_OFFSET(YR_RULE, 8 + 4*MAX_THREADS + 8,  tags);
-  CHECK_OFFSET(YR_RULE, 8 + 4*MAX_THREADS + 16, metas);
-  CHECK_OFFSET(YR_RULE, 8 + 4*MAX_THREADS + 24, strings);
-  CHECK_OFFSET(YR_RULE, 8 + 4*MAX_THREADS + 32, ns);
+  CHECK_OFFSET(YR_RULE, 4,                        t_flags);
+  CHECK_OFFSET(YR_RULE, 8 + 4 * MAX_THREADS,      identifier);
+  CHECK_OFFSET(YR_RULE, 8 + 4 * MAX_THREADS + 8,  tags);
+  CHECK_OFFSET(YR_RULE, 8 + 4 * MAX_THREADS + 16, metas);
+  CHECK_OFFSET(YR_RULE, 8 + 4 * MAX_THREADS + 24, strings);
+  CHECK_OFFSET(YR_RULE, 8 + 4 * MAX_THREADS + 32, ns);
 
   CHECK_SIZE(YR_EXTERNAL_VARIABLE, 24);
   CHECK_OFFSET(YR_EXTERNAL_VARIABLE, 8,  value.i);
@@ -109,31 +109,20 @@ int main (int argc, char **argv)
   CHECK_OFFSET(YR_AC_MATCH, 24, backward_code);
   CHECK_OFFSET(YR_AC_MATCH, 32, next);
 
-  CHECK_SIZE(YR_AC_STATE,24);
+  CHECK_SIZE(YR_AC_STATE, 40);
   CHECK_OFFSET(YR_AC_STATE, 8,  failure);
-  CHECK_OFFSET(YR_AC_STATE, 16, matches);
-
-  CHECK_SIZE(YR_AC_STATE_TRANSITION, 24);
-  CHECK_OFFSET(YR_AC_STATE_TRANSITION, 8,  state);
-  CHECK_OFFSET(YR_AC_STATE_TRANSITION, 16, next);
-
-  CHECK_SIZE(YR_AC_TABLE_BASED_STATE, 2072);
-  CHECK_OFFSET(YR_AC_TABLE_BASED_STATE, 8,  failure);
-  CHECK_OFFSET(YR_AC_TABLE_BASED_STATE, 16, matches);
-  CHECK_OFFSET(YR_AC_TABLE_BASED_STATE, 24, transitions);
-
-  CHECK_SIZE(YR_AC_LIST_BASED_STATE,32);
-  CHECK_OFFSET(YR_AC_LIST_BASED_STATE, 8,  failure);
-  CHECK_OFFSET(YR_AC_LIST_BASED_STATE, 16, matches);
-  CHECK_OFFSET(YR_AC_LIST_BASED_STATE, 24, transitions);
+  CHECK_OFFSET(YR_AC_STATE, 16, first_child);
+  CHECK_OFFSET(YR_AC_STATE, 24, siblings);
+  CHECK_OFFSET(YR_AC_STATE, 32, matches);
 
   CHECK_SIZE(YR_AC_AUTOMATON, 32);
 
-  CHECK_SIZE(YARA_RULES_FILE_HEADER, 56);
+  CHECK_SIZE(YARA_RULES_FILE_HEADER, 48);
   CHECK_OFFSET(YARA_RULES_FILE_HEADER, 8,  rules_list_head);
   CHECK_OFFSET(YARA_RULES_FILE_HEADER, 16, externals_list_head);
   CHECK_OFFSET(YARA_RULES_FILE_HEADER, 24, code_start);
-  CHECK_OFFSET(YARA_RULES_FILE_HEADER, 32, automaton);
+  CHECK_OFFSET(YARA_RULES_FILE_HEADER, 32, match_table);
+  CHECK_OFFSET(YARA_RULES_FILE_HEADER, 40, transition_table);
 
   return err;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git