Skip to content

Commit 382ffeb

Browse files
committed
version bump, ready for pipp publishing.
1 parent 71b5fb3 commit 382ffeb

File tree

4 files changed

+22
-31
lines changed

4 files changed

+22
-31
lines changed

.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ install:
2929

3030
# command to run tests
3131
script:
32+
# # Run unittests
33+
- python -m unittest discover test/ || exit 1
3234
- export WLLVM_HOME=`pwd`
3335
- ${WLLVM_HOME}/.travis/store.sh
34-
# # Run unittests
35-
# - python -m unittest discover test/ || exit 1
36-
# - export APACHE_VER=2.4.18
37-
# # build apache with clang
38-
# - ${WLLVM_HOME}/.travis/apache_clang.sh
39-
# # build apache with gcc and dragonegg
40-
# - ${WLLVM_HOME}/.travis/apache_dragonegg.sh
41-
# # build musllvm with clang
42-
# - ${WLLVM_HOME}/.travis/musllvm.sh
36+
- export APACHE_VER=2.4.18
37+
# build apache with clang
38+
- ${WLLVM_HOME}/.travis/apache_clang.sh
39+
# build apache with gcc and dragonegg
40+
- ${WLLVM_HOME}/.travis/apache_dragonegg.sh
41+
# build musllvm with clang
42+
- ${WLLVM_HOME}/.travis/musllvm.sh

.travis/musllvm.sh

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export WLLVM_OUTPUT=WARNING
1010
wllvm-sanity-checker
1111

1212
#setup the store so we test that feature as well
13-
#export WLLVM_BC_STORE=/tmp/bc
14-
#mkdir /tmp/bc
13+
export WLLVM_BC_STORE=/tmp/bc
14+
mkdir /tmp/bc
1515

1616
git clone https://github.com/SRI-CSL/musllvm.git musllvm
1717
cd musllvm
@@ -27,20 +27,13 @@ else
2727
fi
2828

2929
#now lets makes sure the store has the bitcode too.
30-
#mv ./lib/libc.a .
31-
#make clean
32-
#extract-bc --bitcode ./libc.a
33-
34-
#if [ -s "./libc.a.bc" ]
35-
#then
36-
# echo "libc.a.bc exists."
37-
#else
38-
# exit 1
39-
#fi
40-
41-
42-
43-
44-
45-
30+
mv ./lib/libc.a .
31+
make clean
32+
extract-bc --bitcode ./libc.a
4633

34+
if [ -s "./libc.a.bc" ]
35+
then
36+
echo "libc.a.bc exists."
37+
else
38+
exit 1
39+
fi

.travis/store.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ export PATH=/usr/lib/llvm-3.5/bin:${PATH}
77
export LLVM_COMPILER=clang
88
export WLLVM_OUTPUT=WARNING
99

10-
export WLLVM_OUTPUT=DEBUG
11-
12-
1310
wllvm-sanity-checker
1411

1512
#setup the store so we test that feature as well

wllvm/version.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
5353
1.1.1 - 4/25/2017 bugs introduced by the new fetures have hopefully been eradicated.
5454
55+
1.1.2 - 4/26/2017 encoding issues with hashlib in the python 3 swarm.
5556
5657
"""
5758

58-
wllvm_version = '1.1.1'
59+
wllvm_version = '1.1.2'

0 commit comments

Comments
 (0)