Merge pull request #25 from SRI-CSL/master

travis ci support

Author: travitch

.travis.yml

@@ -0,0 +1,21 @@
+language: python
+python:
+  - "3.3"
+  - "2.7"
+  - "2.6"
+
+# command to install dependencies
+install:
+  - sudo apt-get update
+  - sudo apt-get install llvm-3.4 clang-3.4 libapr1-dev libaprutil1-dev
+  - sudo apt-get install dragonegg llvm-3.3 llvm-gcc
+  - export WLLVM_HOME=`pwd`
+
+# command to run tests
+script:
+  # build apache with clang (i.e. httpd-2.4.12) 
+  - ${WLLVM_HOME}/.travis/apache_clang.sh
+  # when it works we can uncomment this puppy out
+  # - ${WLLVM_HOME}/.travis/apache_dragonegg.sh
+  
+

.travis/apache_clang.sh

@@ -0,0 +1,30 @@
+#!/bin/bash -x
+# Make sure we exit if there is a failure
+set -e
+
+
+export PATH=/usr/lib/llvm-3.4/bin:${WLLVM_HOME}:${PATH}
+export LLVM_COMPILER=clang
+export WLLVM_OUTPUT=WARNING
+
+wget http://apache.mirrors.pair.com//httpd/httpd-2.4.12.tar.gz
+tar xfz httpd-2.4.12.tar.gz
+mv httpd-2.4.12 apache_clang
+cd apache_clang
+CC=wllvm ./configure
+make
+extract-bc httpd
+
+
+if [ -s "httpd.bc" ]
+then
+    echo "httpd.bc built."
+else
+    exit 1
+fi
+
+
+
+
+
+

.travis/apache_dragonegg.sh

@@ -0,0 +1,33 @@
+#!/bin/bash -x
+# Make sure we exit if there is a failure
+set -e
+
+
+export PATH=/usr/lib/llvm-3.0/bin:${WLLVM_HOME}:${PATH}
+export LLVM_COMPILER=dragonegg
+export LLVM_GCC_PREFIX=llvm-
+export LLVM_DRAGONEGG_PLUGIN=/usr/lib/gcc/x86_64-linux-gnu/4.6/plugin/dragonegg.so
+
+export WLLVM_OUTPUT=WARNING
+
+wget http://apache.mirrors.pair.com//httpd/httpd-2.4.12.tar.gz
+tar xfz httpd-2.4.12.tar.gz
+mv httpd-2.4.12 apache_dragonegg
+cd apache_dragonegg
+CC=wllvm ./configure
+make
+extract-bc httpd
+
+
+if [ -s "httpd.bc" ]
+then
+    echo "httpd.bc built."
+else
+    exit 1
+fi
+
+
+
+
+
+

README.md

@@ -1,3 +1,7 @@
+
+[![Build Status](https://travis-ci.org/SRI-CSL/whole-program-llvm.svg?branch=master)](https://travis-ci.org/SRI-CSL/whole-program-llvm)
+
+
 Introduction
 ============
 

driver/utils.py

@@ -68,6 +68,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
 
             #iam: presumably the len(inputFiles) == 0 in this case
             '--version' : (0, ArgumentListFilter.compileOnlyCallback),
+            '-v' : (0, ArgumentListFilter.compileOnlyCallback),
 
             #warnings (apart from the regex below)
             '-w' : (0, ArgumentListFilter.compileOnlyCallback),
@@ -214,7 +215,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             r'^.+\.(c|cc|cpp|C|cxx|i|s|S)$' : (0, ArgumentListFilter.inputFileCallback),
             #iam: the object file recogition is not really very robust, object files
             # should be determined by their existance and contents...
-            r'^.+\.(o|So|so|po|a)$' : (0, ArgumentListFilter.objectFileCallback),
+            r'^.+\.(o|lo|So|so|po|a)$' : (0, ArgumentListFilter.objectFileCallback),
             r'^-(l|L).+$' : (0, ArgumentListFilter.linkUnaryCallback),
             r'^-I.+$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-D.+$' : (0, ArgumentListFilter.compileUnaryCallback),