fix travis

Author: minad

.travis.yml

@@ -1,5 +1,7 @@
 language: c
 
+dist: bionic
+
 script: make test
 
 matrix:
@@ -24,26 +26,6 @@ matrix:
  env:
  - MATRIX_EVAL="CC=clang-4.0"
 
- - os: linux
- addons:
- apt:
- sources:
- - llvm-toolchain-trusty-5.0
- packages:
- - clang-5.0
- env:
- - MATRIX_EVAL="CC=clang-5.0"
-
- - os: linux
- addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - gcc-4.9
- env:
- - MATRIX_EVAL="CC=gcc-4.9"
-
  - os: linux
  addons:
  apt:
@@ -80,9 +62,10 @@ matrix:
  sources:
  - ubuntu-toolchain-r-test
  packages:
- - gcc-i686-linux-gnu
+ - gcc-7-i686-linux-gnu
+ - gcc-7-multilib-i686-linux-gnu
  env:
- - MATRIX_EVAL="CC=i686-linux-gnu-gcc"
+ - MATRIX_EVAL="CC=i686-linux-gnu-gcc-7"
 
 before_install:
  - eval "${MATRIX_EVAL}"

Makefile

@@ -14,21 +14,20 @@ test: all
 ./build/test
 
 CFLAGS = \
--std=c11 -g -O2 \
+-std=gnu11 -g -O2 \
 -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wconversion -Wc++-compat \
 -DTLSF_ASSERT -DTLSF_CHECK
-LDFLAGS = -lrt
-CFLAGS_TEST = $(CFLAGS) -std=gnu11
+LDFLAGS = -lrt -static
 
 OBJS = tlsf.o
 OBJS := $(addprefix $(OUT)/,$(OBJS))
 deps := $(OBJS:%.o=%.o.d)
 
 $(OUT)/test: $(OBJS) test.c
-$(CC) $(CFLAGS_TEST) -o $@ $^ $(LDFLAGS)
+$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 $(OUT)/bench: $(OBJS) bench.c
-$(CC) $(CFLAGS_TEST) -o $@ -MMD -MF $@.d $^ $(LDFLAGS)
+$(CC) $(CFLAGS) -o $@ -MMD -MF $@.d $^ $(LDFLAGS)
 
 $(OUT)/%.o: %.c
 @mkdir -p $(OUT)

bench.c

@@ -139,7 +139,7 @@ int main(int argc, char **argv) {
  int err = clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &start);
  assert(err == 0);
 
- printf("blk_min=%lu to blk_max=%lu\n", blk_min, blk_max);
+ printf("blk_min=%zu to blk_max=%zu\n", blk_min, blk_max);
 
  run_alloc_benchmark(loops, blk_min, blk_max,
  blk_array, num_blks, clear);
@@ -155,7 +155,7 @@ int main(int argc, char **argv) {
  assert(err == 0);
 
  /* Dump both machine and human readable versions */
- printf("%lu:%lu:%lu:%u:%lu:%.6f: took %.6f s for %lu malloc/free\nbenchmark loops of %lu-%lu bytes. ~%.3f us per loop\n",
+ printf("%zu:%zu:%zu:%u:%lu:%.6f: took %.6f s for %zu malloc/free\nbenchmark loops of %zu-%zu bytes. ~%.3f us per loop\n",
  blk_min, blk_max, loops,
  clear, usage.ru_maxrss, elapsed, elapsed, loops, blk_min,
  blk_max, elapsed / (double)loops * 1e6);

test.c

@@ -110,14 +110,14 @@ static void random_sizes_test(tlsf* t) {
 
  while (n--) {
  size_t cap = (size_t)rand() % sizes[i] + 1;
- printf("sizes = %lu, cap = %lu\n", sizes[i], cap);
+ printf("sizes = %zu, cap = %zu\n", sizes[i], cap);
  random_test(t, sizes[i], cap);
  }
  }
 }
 
 static void large_alloc(tlsf* t, size_t s) {
- printf("large alloc %lu\n", s);
+ printf("large alloc %zu\n", s);
  for (size_t d = 0; d < 100 && d < s; ++d) {
  void* p = tlsf_malloc(t, s - d);
  assert(p);