[Forensics-changes] [yara] 341/368: Travis: Show test-suite.log on failure (#467)

[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 9e50e4d39ea2a80bf0f9e987f33165a836d77713
Author: Hilko Bengen <hillu at users.noreply.github.com>
Date:   Thu Jun 23 23:46:34 2016 +0200

    Travis: Show test-suite.log on failure (#467)
    
    * Travis: Show test-suite.log on failure
    
    * Fix alignment tests to account for change made in 7ff47de
    
    * Travis: Configure 32-bit build without support for cuckoo, magic
---
 .travis.yml            | 11 ++++++++++-
 tests/test-alignment.c |  6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e907b8..ebe25f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,16 @@ install:
 
 before_script: ./bootstrap.sh
 
-script: ./configure --enable-cuckoo --enable-magic && make && make check
+script: |
+  set -e
+  case "$CFLAGS" in
+    -m64) ./configure --enable-cuckoo --enable-magic ;;
+    -m32) ./configure ;;
+  esac
+  make
+  make check
+
+after_failure: if [ -e test-suite.log ]; then cat test-suite.log; fi
 
 language: c
 
diff --git a/tests/test-alignment.c b/tests/test-alignment.c
index 80cf7c6..89ff8dc 100644
--- a/tests/test-alignment.c
+++ b/tests/test-alignment.c
@@ -108,9 +108,9 @@ int main (int argc, char **argv)
   CHECK_OFFSET(YARA_RULES_FILE_HEADER, 32, match_table);
   CHECK_OFFSET(YARA_RULES_FILE_HEADER, 40, transition_table);
 
-  CHECK_SIZE(SIZED_STRING, 16);
-  CHECK_OFFSET(SIZED_STRING, 8, flags);
-  CHECK_OFFSET(SIZED_STRING, 12, c_string);
+  CHECK_SIZE(SIZED_STRING, 12);
+  CHECK_OFFSET(SIZED_STRING, 4, flags);
+  CHECK_OFFSET(SIZED_STRING, 8, c_string);
 
   return err;
 }

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