Skip to content

Commit 0cfd7b0

Browse files
committed
Remove PRE_COMMAND scaffolding
1 parent 95c5e63 commit 0cfd7b0

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

.travis.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -142,22 +142,16 @@ jobs:
142142

143143
install:
144144
- ccache --max-size=1G
145-
- COMMAND="make -C src minisat2-download" &&
146-
eval ${PRE_COMMAND} ${COMMAND}
147-
- COMMAND="make -C src/ansi-c library_check" &&
148-
eval ${PRE_COMMAND} ${COMMAND}
149-
- COMMAND="make -C src CXX=\"$COMPILER\" CXXFLAGS=\"-Wall -Werror -pedantic -O2 -g $EXTRA_CXXFLAGS\" -j2" &&
150-
eval ${PRE_COMMAND} ${COMMAND}
151-
- COMMAND="make -C src CXX=\"$COMPILER\" CXXFLAGS=\"$FLAGS $EXTRA_CXXFLAGS\" -j2 clobber.dir memory-models.dir musketeer.dir" &&
152-
eval ${PRE_COMMAND} ${COMMAND}
145+
- make -C src minisat2-download
146+
- make -C src/ansi-c library_check
147+
- make -C src "CXX=${COMPILER}" "CXXFLAGS=-Wall -Werror -pedantic -O2 -g ${EXTRA_CXXFLAGS}" -j2
148+
- make -C src "CXX=${COMPILER}" "CXXFLAGS=-Wall -Werror -pedantic -O2 -g ${EXTRA_CXXFLAGS}" -j2 clobber.dir memory-models.dir musketeer.dir
153149

154150
script:
155151
- if [ -e bin/gcc ] ; then export PATH=$PWD/bin:$PATH ; fi ;
156-
COMMAND="env UBSAN_OPTIONS=print_stacktrace=1 make -C regression test CXX=\"$COMPILER\" CXXFLAGS=\"-Wall -Werror -pedantic -O2 -g $EXTRA_CXXFLAGS\"" &&
157-
eval ${PRE_COMMAND} ${COMMAND}
158-
- COMMAND="make -C unit CXX=\"$COMPILER\" CXXFLAGS=\"-Wall -Werror -pedantic -O2 -g $EXTRA_CXXFLAGS\" -j2" &&
159-
eval ${PRE_COMMAND} ${COMMAND}
160-
- COMMAND="make -C unit test" && eval ${PRE_COMMAND} ${COMMAND}
152+
- env UBSAN_OPTIONS=print_stacktrace=1 make -C regression test "CXX=${COMPILER}" "CXXFLAGS=-Wall -Werror -pedantic -O2 -g ${EXTRA_CXXFLAGS}"
153+
- make -C unit "CXX=${COMPILER}" "CXXFLAGS=-Wall -Werror -pedantic -O2 -g ${EXTRA_CXXFLAGS}" -j2
154+
- make -C unit test
161155

162156
before_cache:
163157
- ccache -s

0 commit comments

Comments
 (0)