cirrus: make macos image match reality (catalina)

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 57f13d15aa3f1e7a0cc9f2fa5320b9d88af9900c..51afd1a0a722933812de191408b9af5af648ea21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,9 @@ current_sampledata := t/sampledata/var/rev/v$(sampledata_rev)
 os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
 os := $(call shout,$(os),Unable to determine OS)
 
-CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
-CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
+CFLAGS := -O2 -Wall -Werror -Wformat=2 $(CFLAGS)
+CFLAGS := -Wno-unknown-pragmas -Wsign-compare $(CFLAGS)
+CFLAGS := -D_FILE_OFFSET_BITS=64 $(PYINCLUDE) $(CFLAGS)
 SOEXT:=.so
 
 ifeq ($(os),CYGWIN)
@@ -143,9 +144,6 @@ install: all
            $(INSTALL) -pm 0644 lib/bup/source_info.py $(dest_libdir)/bup/; \
        fi
 
-
-           $(INSTALL) -pm 0644 lib/bup/checkout_info.py $(dest_libdir)/bup/; \
-
 config/config.h: config/config.vars
 
 lib/bup/_helpers$(SOEXT): \
@@ -166,6 +164,7 @@ runtests: runtests-python runtests-cmdline
 python_tests := \
   lib/bup/t/tbloom.py \
   lib/bup/t/tclient.py \
+  lib/bup/t/tcompat.py \
   lib/bup/t/tgit.py \
   lib/bup/t/thashsplit.py \
   lib/bup/t/thelpers.py \
@@ -188,6 +187,7 @@ runtests-python: all t/tmp
            | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
+  t/test-help \
   t/test.sh \
   t/test-argv \
   t/test-cat-file.sh \