Skip to content

Commit

Permalink
ci: various tweaks
Browse files Browse the repository at this point in the history
* make etc/ci-gather-coverage.sh more verbose
* output timings for configure and make
* remove hack for NormalizInterface-0.9.8
* re-enable digraphs, semigroups, float
* disable xgap
  • Loading branch information
fingolfin committed Nov 9, 2018
1 parent 8386a08 commit 0d23c34
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 21 deletions.
9 changes: 6 additions & 3 deletions etc/ci-gather-coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi
SRCDIR=${SRCDIR:-$PWD}

# Make sure any Error() immediately exits GAP with exit code 1.
GAP="bin/gap.sh --quitonbreak -q"
GAP="bin/gap.sh --quitonbreak --nointeract --alwaystrace -q"

# change into BUILDDIR (creating it if necessary), and turn it into an absolute path
if [[ -n "$BUILDDIR" ]]
Expand All @@ -38,12 +38,15 @@ if LoadPackage("profiling") <> true then
FORCE_QUIT_GAP(1);
fi;
d := Directory("$COVDIR");;
Print("Scanning for coverage data...\n");
covs := [];;
for f in DirectoryContents(d) do
if f in [".", ".."] then continue; fi;
Add(covs, Filename(d, f));
f := Filename(d, f);
Add(covs, f);
Print(" ", f, "\n");
od;
Print("Merging coverage results\n");
Print("Merging ", Length(covs), " coverage files...\n");
r := MergeLineByLineProfiles(covs);;
Print("Outputting JSON\n");
OutputJsonCoverage(r, "gap-coverage.json");;
Expand Down
4 changes: 2 additions & 2 deletions etc/ci-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ fi


# configure and make GAP
"$SRCDIR/configure" $CONFIGFLAGS --enable-Werror
make V=1 -j4
time "$SRCDIR/configure" $CONFIGFLAGS --enable-Werror
time make V=1 -j4

# download packages; instruct wget to retry several times if the
# connection is refused, to work around intermittent failures
Expand Down
21 changes: 5 additions & 16 deletions etc/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,15 @@ do
rm -rf pargap*
# skip PolymakeInterface: no polynmake installed (TODO: is there a polymake package we can use)
rm -rf PolymakeInterface*
# skip xgap: no X11 headers, and no means to test it
rm -rf xgap*

# HACK to work out timestamp issues with anupq
touch anupq*/configure* anupq*/Makefile* anupq*/aclocal.m4

# HACK: skip building digraphs for now -- it doesn't link reliably on travis
rm -rf digraphs-*

# HACK: skip building semigroups-3.x for now -- it requires GCC >= 5, which Travis doesn't have
rm -rf semigroups-3.*

# HACK: skip building float for now -- it doesn't link reliably on travis
rm -rf float-*

if [[ x"$ABI" == "x32" ]]
then
# HACK: disable NormalizInterface in 32bit mode for now. Version
# 0.9.8 doesn't make it easy to support 32bit. With the next
# release of the package, this will hopefully change.
rm -rf NormalizInterface-0.9.8
fi
# HACK: workaround GMP 5 bug causing "error: '::max_align_t' has not been declared",
# see <https://gcc.gnu.org/gcc-4.9/porting_to.html>
printf "%s\n" 1 i "#include <stddef.h>" . w | ed float*/src/mp_poly.C

# reset CFLAGS and LDFLAGS before compiling packages, to prevent
# them from being compiled with coverage gathering, because
Expand Down

0 comments on commit 0d23c34

Please sign in to comment.