From cc882a4195641178279f4c8c04331948ec017bce Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Sat, 5 Jun 2021 21:43:20 +0200
Subject: Throw out a bunch of test stuff, hopefully fix CI build

---
 .gitlab-ci.yml                    | 4 ++--
 svg-flatten/Makefile              | 9 ++++-----
 svg-flatten/src/test/svg_tests.py | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 798e666..798607f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ ubuntu_2004:
   stage: build
   image: "registry.gitlab.com/gerbolyze/build-containers/ubuntu:20.04"
   script:
-    - "export PATH=$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
+    - "export PATH=$HOME/.local/bin:$HOME/.cargo/bin:$PATH CXX=clang++"
     - "python3 setup.py install --user"
     - "gerbolyze --help"
 
@@ -24,7 +24,7 @@ fedora_33:
   stage: build
   image: "registry.gitlab.com/gerbolyze/build-containers/fedora:33"
   script:
-    - "export PATH=$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
+    - "export PATH=$HOME/.local/bin:$HOME/.cargo/bin:$PATH CXX=clang++"
     - "python3 setup.py install --user"
     - "gerbolyze --help"
 
diff --git a/svg-flatten/Makefile b/svg-flatten/Makefile
index 2c9ff6c..18edfd9 100644
--- a/svg-flatten/Makefile
+++ b/svg-flatten/Makefile
@@ -26,11 +26,11 @@ SOURCES := src/svg_color.cpp \
 	src/lambda_sink.cpp \
 	src/flatten.cpp \
 	src/nopencv.cpp \
-	$(UPSTREAM_DIR)/cpp-base64/base64.cpp
+	$(UPSTREAM_DIR)/cpp-base64/base64.cpp \
+	$(UPSTREAM_DIR)/clipper-6.4.2/cpp/clipper.cpp \
+	$(UPSTREAM_DIR)/pugixml/src/pugixml.cpp
 
-PUGIXML_SOURCES 	?= $(UPSTREAM_DIR)/pugixml/src/pugixml.cpp
 PUGIXML_INCLUDES 	?= -I$(UPSTREAM_DIR)/pugixml/src
-CLIPPER_SOURCES 	?= $(UPSTREAM_DIR)/clipper-6.4.2/cpp/clipper.cpp
 CLIPPER_INCLUDES 	?= -I$(UPSTREAM_DIR)/clipper-6.4.2/cpp
 VORONOI_INCLUDES 	?= -I$(UPSTREAM_DIR)/voronoi/src
 POISSON_INCLUDES 	?= -I$(UPSTREAM_DIR)/poisson-disk-sampling/thinks/poisson_disk_sampling/
@@ -41,10 +41,9 @@ SUBPROCESS_INCLUDES	?= -I$(UPSTREAM_DIR)/subprocess.h
 MINUNIT_INCLUDES	?= -I$(UPSTREAM_DIR)/minunit
 STB_INCLUDES		?= -isystem$(UPSTREAM_DIR)/stb
 
-SOURCES += $(CLIPPER_SOURCES)
 INCLUDES := -Iinclude -Isrc $(CLIPPER_INCLUDES) $(VORONOI_INCLUDES) $(POISSON_INCLUDES) $(BASE64_INCLUDES) $(ARGAGG_INCLUDES) $(CAVC_INCLUDES) $(SUBPROCESS_INCLUDES) $(MINUNIT_INCLUDES) $(STB_INCLUDES)
 
-CXXFLAGS := -std=c++2a -g -Wall -Wextra -O0
+CXXFLAGS := -std=c++2a -g -Wall -Wextra -O2
 LDFLAGS := -lm
 
 PKG_CONFIG_DEPS := 
diff --git a/svg-flatten/src/test/svg_tests.py b/svg-flatten/src/test/svg_tests.py
index e4cff76..f98e367 100644
--- a/svg-flatten/src/test/svg_tests.py
+++ b/svg-flatten/src/test/svg_tests.py
@@ -100,9 +100,9 @@ class SVGRoundTripTests(unittest.TestCase):
         #print_stats(ref)
         #print_stats(out)
 
-        print(f'{test_name}: mean={delta.mean():.5g}')
+        # print(f'{test_name}: mean={delta.mean():.5g}')
 
-        self.fail('debug')
+        # self.fail('debug')
         self.assertTrue(delta.mean() < mean,
                 f'Expected mean pixel difference between images to be <{mean}, was {delta.mean():.5g}')
 
-- 
cgit