From 7cc7cef9502dc388706561cbdf275e070520e65d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 8 May 2020 11:34:09 +0200
Subject: [PATCH] Move unit tests to sr/libutil/tests, use mk make rules

---
 Makefile                                              |  4 ++--
 src/libutil/tests/local.mk                            | 11 +++++++++++
 .../test-util.cc => src/libutil/tests/tests.cc        |  4 ++--
 tests/unit-tests/local.mk                             |  4 ----
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 src/libutil/tests/local.mk
 rename tests/unit-tests/test-util.cc => src/libutil/tests/tests.cc (99%)
 delete mode 100644 tests/unit-tests/local.mk

diff --git a/Makefile b/Makefile
index 06de35a27..0ba011e2a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ makefiles = \
   local.mk \
   nix-rust/local.mk \
   src/libutil/local.mk \
+  src/libutil/tests/local.mk \
   src/libstore/local.mk \
   src/libfetchers/local.mk \
   src/libmain/local.mk \
@@ -16,8 +17,7 @@ makefiles = \
   misc/upstart/local.mk \
   doc/manual/local.mk \
   tests/local.mk \
-  tests/plugins/local.mk \
-  tests/unit-tests/local.mk
+  tests/plugins/local.mk
 
 -include Makefile.config
 
diff --git a/src/libutil/tests/local.mk b/src/libutil/tests/local.mk
new file mode 100644
index 000000000..9c2d2a7bb
--- /dev/null
+++ b/src/libutil/tests/local.mk
@@ -0,0 +1,11 @@
+programs += libutil-tests
+
+libutil-tests_DIR := $(d)
+
+libutil-tests_SOURCES := $(wildcard $(d)/*.cc)
+
+libutil-tests_CXXFLAGS += -I src/libutil
+
+libutil-tests_LIBS = libutil
+
+libutil-tests_LDFLAGS := $$(pkg-config --libs gtest_main)
diff --git a/tests/unit-tests/test-util.cc b/src/libutil/tests/tests.cc
similarity index 99%
rename from tests/unit-tests/test-util.cc
rename to src/libutil/tests/tests.cc
index a0fa7c109..fb593b5e6 100644
--- a/tests/unit-tests/test-util.cc
+++ b/src/libutil/tests/tests.cc
@@ -1,5 +1,5 @@
-#include "../../src/libutil/util.hh"
-#include "../../src/libutil/types.hh"
+#include "util.hh"
+#include "types.hh"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/unit-tests/local.mk b/tests/unit-tests/local.mk
deleted file mode 100644
index ed11261c1..000000000
--- a/tests/unit-tests/local.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBS=-larchive -lcrypto -llzma -lbz2 -lz -lbrotlienc -lbrotlidec
-unit-tests:
-	echo $(nix_LDFLAGS)
-	$(CXX) -o unit-test $(nix_CXXFLAGS) $(nix_LDFLAGS) $(LIBS) --std=c++17 $$(pkg-config --libs gtest_main) ./src/libutil/*.o tests/unit-tests/test-util.cc