Merge branch 'master' of https://github.com/SRI-CSL/whole-program-llvm

Author: ianamason

.pylintrc

@@ -1,3 +1,9 @@
+# iam: generated by
+#
+# pylint --generate-rcfile > .pylintrc
+#
+# then customized to ignore my warts
+
 [MASTER]
 
 # Specify a configuration file.

.travis.yml

@@ -4,29 +4,35 @@ sudo: required
 dist: trusty
 
 python:
+  - "3.5"
+  - "3.4"
   - "3.3"
   - "2.7"
-  - "2.6"
 
 
 # command to install dependencies
 install:
   - sudo apt-get update
-  # to install wllvm
-  - sudo apt-get install -y python-pip
   # apache prerequisites
   - sudo apt-get install  -y libapr1-dev libaprutil1-dev
   # for the clang build  
   - sudo apt-get install  -y llvm-3.5 clang-3.5
   # dragonegg prereqs. dragonegg and llvm-gcc use llvm 3.3
   - sudo apt-get install  -y llvm-3.3 llvm-gcc-4.7
-  - sudo pip install -e .
-  - export WLLVM_HOME=`pwd`
-  - export APACHE_VER=2.4.18
+  # Install wllvm
+  # Report the version of pip being used for debugging purposes.
+  # It should report the site-packages directory and the version
+  # of python it is working with.
+  - pip --version
+  - pip install -e .
 
 
 # command to run tests
 script:
+  # Run unittests
+  - python -m unittest discover test/ || exit 1
+  - export WLLVM_HOME=`pwd`
+  - export APACHE_VER=2.4.18
   # build apache with clang
   - ${WLLVM_HOME}/.travis/apache_clang.sh
   # build apache with gcc and dragonegg

.travis/apache_clang.sh

@@ -7,6 +7,8 @@ export PATH=/usr/lib/llvm-3.5/bin:${PATH}
 export LLVM_COMPILER=clang
 export WLLVM_OUTPUT=WARNING
 
+wllvm-sanity-checker
+
 wget https://archive.apache.org/dist/httpd/httpd-${APACHE_VER}.tar.gz
 
 tar xfz httpd-${APACHE_VER}.tar.gz

.travis/apache_dragonegg.sh

@@ -11,6 +11,8 @@ export LLVM_DRAGONEGG_PLUGIN=/usr/lib/gcc/x86_64-linux-gnu/4.7/plugin/dragonegg.
 
 export WLLVM_OUTPUT=WARNING
 
+wllvm-sanity-checker
+
 wget https://archive.apache.org/dist/httpd/httpd-${APACHE_VER}.tar.gz
 
 

README.md

@@ -1,4 +1,4 @@
-![WLLVM](https://github.com/SRI-CSL/whole-program-llvm/blob/master/img/dragon128x128.png?raw_true)Whole Program LLVM
+![WLLVM](img/dragon128x128.png?raw_true)Whole Program LLVM
 ==================
 [![PyPI version](https://badge.fury.io/py/wllvm.svg)](https://badge.fury.io/py/wllvm)
 [![Build Status](https://travis-ci.org/SRI-CSL/whole-program-llvm.svg?branch=master)](https://travis-ci.org/SRI-CSL/whole-program-llvm)
@@ -51,9 +51,27 @@ Tutorial
 =======
 If you want to develop or use the development version:
 
-    git clone https://github.com/SRI-CSL/whole-program-llvm
-    cd whole-program-llvm
-    pip install -e .
+```
+git clone https://github.com/travitch/whole-program-llvm
+cd whole-program-llvm
+```
+
+Now you need to install WLLVM. You can either install
+globally on your system in develop mode:
+
+```
+sudo pip install -e .
+```
+
+or install WLLVM into a virtual python environment
+in develop mode to avoid installing globally:
+
+```
+virtualenv venv
+source venv/bin/activate
+pip install -e .
+```
+
 
 
 Usage
@@ -126,7 +144,7 @@ Tutorials
 ---------
 
 A gentler set of instructions on building apache in a vagrant Ubuntu 14.04 can be found
-[here,](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial.md) and for Ubuntu 16.04 [here.](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial-ubuntu-16.04.md)
+[here,](doc/tutorial.md) and for Ubuntu 16.04 [here.](doc/tutorial-ubuntu-16.04.md)
 
 Building a bitcode module with dragonegg
 ----------------------------------------
@@ -173,7 +191,7 @@ Building an Operating System
 ----------------------------
 
 To see how to build freeBSD 10.0 from scratch check out this
-[guide.](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial-freeBSD.md)
+[guide.](doc/tutorial-freeBSD.md)
 
 
 Configuring without building bitcode
@@ -239,4 +257,4 @@ it might point out what is wrong.
 License
 -------
 
-WLLVM is released under the MIT license. See the file `LICENSE` for [details.](https://github.com/SRI-CSL/whole-program-llvm/blob/master/LICENSE)
+WLLVM is released under the MIT license. See the file `LICENSE` for [details.](LICENSE)

wllvm/checker.py

@@ -6,12 +6,14 @@
 wllvm point of view. Useful first step in trying to
 debug a failure.
 """
+from __future__ import print_function
 
 import sys
 import os
 import subprocess as sp
 import errno
 
+
 explain_LLVM_COMPILER = """
 
 The environment variable 'LLVM_COMPILER' is a switch. It should either
@@ -91,7 +93,7 @@ def check(self):
         """
 
         if not self.checkOS():
-            print 'I do not think we support your OS. Sorry.'
+            print('I do not think we support your OS. Sorry.')
             return 1
 
         success = self.checkCompiler()
@@ -152,18 +154,18 @@ def checkDragoneggPlugin(self):
         plugin = os.getenv('LLVM_DRAGONEGG_PLUGIN')
 
         if not plugin:
-            print explain_LLVM_DRAGONEGG_PLUGIN
+            print(explain_LLVM_DRAGONEGG_PLUGIN)
             return False
 
         if os.path.isfile(plugin):
             try:
                 open(plugin)
             except IOError as e:
-                print "Unable to open {0}: {1}".format(plugin, str(e))
+                print("Unable to open {0}: {1}".format(plugin, str(e)))
             else:
                 return True
         else:
-            print "Could not find {0}".format(plugin)
+            print("Could not find {0}".format(plugin))
             return False
 
 
@@ -172,16 +174,16 @@ def checkCompiler(self):
         (code, comment) = self.checkSwitch()
 
         if code == 0:
-            print comment
+            print(comment)
             return False
         elif code == 1:
-            print comment
+            print(comment)
             return self.checkClang()
         elif code == 2:
-            print comment
+            print(comment)
             return self.checkDragonegg()
         else:
-            print 'Insane'
+            print('Insane')
             return False
 
 
@@ -192,21 +194,21 @@ def checkCompilers(self, cc, cxx):
         (cxxOk, cxxVersion) = self.checkExecutable(cxx)
 
         if not ccOk:
-            print 'The C compiler {0} was not found or not executable.\nBetter not try using wllvm!\n'.format(cc)
+            print('The C compiler {0} was not found or not executable.\nBetter not try using wllvm!\n'.format(cc))
         else:
-            print 'The C compiler {0} is:\n\n{1}\n'.format(cc, extractLine(ccVersion, 0))
+            print('The C compiler {0} is:\n\n{1}\n'.format(cc, extractLine(ccVersion, 0)))
 
         if not cxxOk:
-            print 'The CXX compiler {0} was not found or not executable.\nBetter not try using wllvm++!\n'.format(cxx)
+            print('The CXX compiler {0} was not found or not executable.\nBetter not try using wllvm++!\n'.format(cxx))
         else:
-            print 'The C++ compiler {0} is:\n\n{1}\n'.format(cxx, extractLine(cxxVersion, 0))
+            print('The C++ compiler {0} is:\n\n{1}\n'.format(cxx, extractLine(cxxVersion, 0)))
 
         if not ccOk or  not cxxOk:
-            print explain_LLVM_COMPILER_PATH
+            print(explain_LLVM_COMPILER_PATH)
             if not ccOk:
-                print explain_LLVM_CC_NAME
+                print(explain_LLVM_CC_NAME)
             if not cxxOk:
-                print explain_LLVM_CXX_NAME
+                print(explain_LLVM_CXX_NAME)
 
 
 
@@ -251,16 +253,16 @@ def checkAuxiliaries(self):
         (arOk, arVersion) = self.checkExecutable(ar, '-version')
 
         if not linkOk:
-            print 'The bitcode linker {0} was not found or not executable.\nBetter not try using extract-bc!\n'.format(link)
-            print explain_LLVM_LINK_NAME
+            print('The bitcode linker {0} was not found or not executable.\nBetter not try using extract-bc!\n'.format(link))
+            print(explain_LLVM_LINK_NAME)
         else:
-            print 'The bitcode linker {0} is:\n\n{1}\n'.format(link, extractLine(linkVersion, 1))
+            print('The bitcode linker {0} is:\n\n{1}\n'.format(link, extractLine(linkVersion, 1)))
 
         if not arOk:
-            print 'The bitcode archiver {0} was not found or not executable.\nBetter not try using extract-bc!\n'.format(ar)
-            print explain_LLVM_AR_NAME
+            print('The bitcode archiver {0} was not found or not executable.\nBetter not try using extract-bc!\n'.format(ar))
+            print(explain_LLVM_AR_NAME)
         else:
-            print 'The bitcode archiver {0} is:\n\n{1}\n'.format(ar, extractLine(arVersion, 1))
+            print('The bitcode archiver {0} is:\n\n{1}\n'.format(ar, extractLine(arVersion, 1)))
 
 
 

wllvm/extraction.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import os
 import sys
 import subprocess as sp
@@ -87,7 +89,7 @@ def getSectionContent(size, offset, filename):
             d = c.decode('utf-8')
         except UnicodeDecodeError:
             _logger.error('Failed to read section containing:')
-            print c
+            print(c)
             raise
         # The linker pads sections with null bytes; our real data
         # cannot have null bytes because it is just text.  Discard

wllvm/version.py

@@ -38,5 +38,12 @@
 
 1.0.14   - 11/10/2016  --coverage flag.
 
+1.0.15   - 11/15/2016  pylintification complete.
+
+1.0.16   - 11/16/2016  ooops musl points out I screwed up the exit codes AGAIN.
+
+1.0.17   - 11/23/2016  delcypher  #16  over at travitch's place.
+
 """
-wllvm_version = '1.0.14'
+
+wllvm_version = '1.0.17'