|
|
|
@ -54,7 +54,7 @@ if test "x$BUILD_CLANG" = "xtrue" ; then
|
|
|
|
|
rm -rf "$BUILDDIR"
|
|
|
|
|
mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; }
|
|
|
|
|
( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake .. && make -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; }
|
|
|
|
|
( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR." ; exit 1 ; }
|
|
|
|
|
( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR (clang)." ; exit 1 ; }
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
@ -93,7 +93,7 @@ TMPDIR=$(mktemp -d --suffix="-calamares-$D")
|
|
|
|
|
test -d "$TMPDIR" || { echo "Could not create tarball-build directory." ; exit 1 ; }
|
|
|
|
|
tar xzf "$TAR_FILE" -C "$TMPDIR" || { echo "Could not unpack tarball." ; exit 1 ; }
|
|
|
|
|
test -d "$TMPDIR/$TAR_V" || { echo "Tarball did not contain source directory." ; exit 1 ; }
|
|
|
|
|
( cd "$TMPDIR/$TAR_V" && cmake . && make -j4 && make test ) || { echo "Tarball build failed." ; exit 1 ; }
|
|
|
|
|
( cd "$TMPDIR/$TAR_V" && cmake . && make -j4 && make test ) || { echo "Tarball build failed in $TMPDIR." ; exit 1 ; }
|
|
|
|
|
|
|
|
|
|
### Cleanup
|
|
|
|
|
#
|
|
|
|
|