summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-12-09 05:48:26 (GMT)
committerMarius Kintel <marius@kintel.net>2013-12-09 05:48:26 (GMT)
commit7e0917d6b22fe8225fff7c66d352145d669a4a5d (patch)
tree10923429ee676f33cc5dd7438500c4a81676fe78 /scripts
parent3bd224b990f6d6b4c51072bf0c3ae895fbfe707e (diff)
parente96305ddf5a728eb323a86e4e900752ae2a6ccfe (diff)
Merge branch 'travis'
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/travis-ci.sh5
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/travis-ci.sh b/scripts/travis-ci.sh
index 9d4258a..9f44b0c 100755
--- a/scripts/travis-ci.sh
+++ b/scripts/travis-ci.sh
@@ -1,10 +1,5 @@
#!/bin/bash
-qmake && make -j4
-if [[ $? != 0 ]]; then
- echo "Error building OpenSCAD executable"
- exit 1
-fi
cd tests
cmake .
if [[ $? != 0 ]]; then
contact: Jan Huwald // Impressum