1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
#!/bin/sh
xvfb-run ctest -j2 --output-on-failure
PROC_RET=$?
if [ "$PROC_RET" -ne 0 ]; then
killall Xvfb
xvfb-run ./mtest
fi
# Searching for merge conflicts, by searching for the begin/end markers.
# Searching for the middle marker '=======)" won't work though as that is
# used elsewhere too.
# Haven't found a way without using an intermediate temp file.
rm -f /tmp/$$ # Cleanup, just in case of an older leftover
find ../.. -type f ! -name `basename $0` -print0 |
xargs -0r egrep -n '<<<<<<< HEAD|>>>>>>> .*' |
tee /tmp/$$
if [ -s /tmp/$$ ]; then # File not empty
PROC_RET=`expr $PROC_RET + 1` # Store the error
printf "\033[31m" # Set color to (doesn't work on Travis though)
echo
echo "problem with a merge conflict"
echo
printf "\033[0m" # Reset color
fi
rm -f /tmp/$$ # Cleanup
#pwd == build.debug/mtest
cd ../../vtest
xvfb-run ./gen
cd -
#make reporthtml
#REVISION=`git rev-parse --short HEAD`
#mv report/html $REVISION
#mv report/*.xml $REVISION
#chmod 755 $REVISION
#chmod 644 $REVISION/*
#zip -r $REVISION.zip $REVISION
#curl -F zip_file=@$REVISION.zip http://prereleases.musescore.org/test/index.php
#echo "Test results: http://prereleases.musescore.org/test/$REVISION/"
exit $PROC_RET
|
