From 65486892b8811807a0a5b3759d2201aca98a475c Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Sun, 27 Aug 2023 18:04:24 +1000 Subject: [PATCH] Clean up unit tests Don't use the symlinked-header trick that we previously used to include application headers in the tests; instead change from using: > #include "..." to > #include <...> ... generally, so it is possible to override included headers via the include path; use this in the tests to override various headers, instead of duplicating the entire "includes" directory via symlinks to a combination of the original headers plus mock headers. --- src/includes/baseproc-sys.h | 2 +- src/includes/control.h | 10 ++++----- src/includes/cpbuffer.h | 2 +- src/includes/dinit-client.h | 6 ++--- src/includes/dinit-env.h | 4 ++-- src/includes/dinit-util.h | 2 +- src/includes/dinit-utmp.h | 2 +- src/includes/load-service.h | 10 ++++----- src/includes/options-processing.h | 2 +- src/includes/proc-service.h | 6 ++--- src/includes/service-constants.h | 2 +- src/includes/service-listener.h | 2 +- src/includes/service.h | 22 +++++++++---------- src/tests/Makefile | 6 ++--- src/tests/cptests/Makefile | 10 ++++----- src/tests/cptests/cptests.cc | 10 ++++----- src/tests/cptests/includes/baseproc-sys.h | 1 - src/tests/cptests/includes/control-cmds.h | 1 - src/tests/cptests/includes/control.h | 1 - src/tests/cptests/includes/cpbuffer.h | 1 - src/tests/cptests/includes/dinit-client.h | 1 - src/tests/cptests/includes/dinit-env.h | 1 - src/tests/cptests/includes/dinit-ll.h | 1 - src/tests/cptests/includes/dinit-log.h | 1 - src/tests/cptests/includes/dinit-socket.h | 1 - src/tests/cptests/includes/dinit-util.h | 1 - src/tests/cptests/includes/dinit-utmp.h | 1 - src/tests/cptests/includes/dinit.h | 1 - src/tests/cptests/includes/load-service.h | 1 - .../cptests/includes/options-processing.h | 1 - src/tests/cptests/includes/proc-service.h | 1 - .../cptests/includes/service-constants.h | 1 - src/tests/cptests/includes/service-dir.h | 1 - src/tests/cptests/includes/service-listener.h | 1 - src/tests/cptests/includes/service.h | 1 - src/tests/cptests/includes/static-string.h | 1 - src/tests/includes/baseproc-sys.h | 1 - src/tests/includes/control-cmds.h | 1 - src/tests/includes/control.h | 1 - src/tests/includes/cpbuffer.h | 1 - src/tests/includes/dinit-client.h | 1 - src/tests/includes/dinit-env.h | 1 - src/tests/includes/dinit-ll.h | 1 - src/tests/includes/dinit-log.h | 1 - src/tests/includes/dinit-socket.h | 1 - src/tests/includes/dinit-util.h | 1 - src/tests/includes/dinit-utmp.h | 1 - src/tests/includes/dinit.h | 1 - src/tests/includes/load-service.h | 1 - src/tests/includes/options-processing.h | 1 - src/tests/includes/proc-service.h | 1 - src/tests/includes/service-constants.h | 1 - src/tests/includes/service-dir.h | 1 - src/tests/includes/service-listener.h | 1 - src/tests/includes/service.h | 1 - src/tests/includes/static-string.h | 1 - src/tests/test-includes/control.h | 14 ------------ 57 files changed, 49 insertions(+), 103 deletions(-) delete mode 120000 src/tests/cptests/includes/baseproc-sys.h delete mode 120000 src/tests/cptests/includes/control-cmds.h delete mode 120000 src/tests/cptests/includes/control.h delete mode 120000 src/tests/cptests/includes/cpbuffer.h delete mode 120000 src/tests/cptests/includes/dinit-client.h delete mode 120000 src/tests/cptests/includes/dinit-env.h delete mode 120000 src/tests/cptests/includes/dinit-ll.h delete mode 120000 src/tests/cptests/includes/dinit-log.h delete mode 120000 src/tests/cptests/includes/dinit-socket.h delete mode 120000 src/tests/cptests/includes/dinit-util.h delete mode 120000 src/tests/cptests/includes/dinit-utmp.h delete mode 120000 src/tests/cptests/includes/dinit.h delete mode 120000 src/tests/cptests/includes/load-service.h delete mode 120000 src/tests/cptests/includes/options-processing.h delete mode 120000 src/tests/cptests/includes/proc-service.h delete mode 120000 src/tests/cptests/includes/service-constants.h delete mode 120000 src/tests/cptests/includes/service-dir.h delete mode 120000 src/tests/cptests/includes/service-listener.h delete mode 120000 src/tests/cptests/includes/service.h delete mode 120000 src/tests/cptests/includes/static-string.h delete mode 120000 src/tests/includes/baseproc-sys.h delete mode 120000 src/tests/includes/control-cmds.h delete mode 120000 src/tests/includes/control.h delete mode 120000 src/tests/includes/cpbuffer.h delete mode 120000 src/tests/includes/dinit-client.h delete mode 120000 src/tests/includes/dinit-env.h delete mode 120000 src/tests/includes/dinit-ll.h delete mode 120000 src/tests/includes/dinit-log.h delete mode 120000 src/tests/includes/dinit-socket.h delete mode 120000 src/tests/includes/dinit-util.h delete mode 120000 src/tests/includes/dinit-utmp.h delete mode 120000 src/tests/includes/dinit.h delete mode 120000 src/tests/includes/load-service.h delete mode 120000 src/tests/includes/options-processing.h delete mode 120000 src/tests/includes/proc-service.h delete mode 120000 src/tests/includes/service-constants.h delete mode 120000 src/tests/includes/service-dir.h delete mode 120000 src/tests/includes/service-listener.h delete mode 120000 src/tests/includes/service.h delete mode 120000 src/tests/includes/static-string.h delete mode 100644 src/tests/test-includes/control.h diff --git a/src/includes/baseproc-sys.h b/src/includes/baseproc-sys.h index 0cefcfa8..4bb2380a 100644 --- a/src/includes/baseproc-sys.h +++ b/src/includes/baseproc-sys.h @@ -10,7 +10,7 @@ #include // getenv -#include "dasynq.h" // for pipe2 +#include // for pipe2 #include // writev #include diff --git a/src/includes/control.h b/src/includes/control.h index 5c5515b9..1d88f92d 100644 --- a/src/includes/control.h +++ b/src/includes/control.h @@ -10,11 +10,11 @@ #include -#include "dinit.h" -#include "dinit-log.h" -#include "control-cmds.h" -#include "service-listener.h" -#include "cpbuffer.h" +#include +#include +#include +#include +#include // Control connection for dinit diff --git a/src/includes/cpbuffer.h b/src/includes/cpbuffer.h index 75543ab3..9e0352f4 100644 --- a/src/includes/cpbuffer.h +++ b/src/includes/cpbuffer.h @@ -5,7 +5,7 @@ #include #include -#include "baseproc-sys.h" +#include // control protocol buffer, a circular buffer with fixed capacity. template class cpbuffer diff --git a/src/includes/dinit-client.h b/src/includes/dinit-client.h index c00c6f1f..9c58653d 100644 --- a/src/includes/dinit-client.h +++ b/src/includes/dinit-client.h @@ -4,9 +4,9 @@ #include #include -#include "mconfig.h" -#include "cpbuffer.h" -#include "control-cmds.h" +#include +#include +#include // Client library for Dinit clients diff --git a/src/includes/dinit-env.h b/src/includes/dinit-env.h index 6f269f1e..d43cc2e2 100644 --- a/src/includes/dinit-env.h +++ b/src/includes/dinit-env.h @@ -4,8 +4,8 @@ #include #include -#include "dinit-util.h" -#include "baseproc-sys.h" +#include +#include class environment; extern environment main_env; diff --git a/src/includes/dinit-util.h b/src/includes/dinit-util.h index 1bad531d..2ad3e29d 100644 --- a/src/includes/dinit-util.h +++ b/src/includes/dinit-util.h @@ -15,7 +15,7 @@ #include #include -#include "baseproc-sys.h" +#include // Check if a value is one of several possible values. // Use like: value(x).is_in(1,2,3) diff --git a/src/includes/dinit-utmp.h b/src/includes/dinit-utmp.h index 01778866..e7050fb2 100644 --- a/src/includes/dinit-utmp.h +++ b/src/includes/dinit-utmp.h @@ -3,7 +3,7 @@ #ifndef DINIT_UTMP_H_INCLUDED #define DINIT_UTMP_H_INCLUDED -#include "mconfig.h" // pull in any explicit configuration +#include // pull in any explicit configuration // Configuration: // USE_UTMPX - whether to update the utmp[x] database. If 0, no-op stubs are defined. diff --git a/src/includes/load-service.h b/src/includes/load-service.h index 5b9f9544..0ebbcb41 100644 --- a/src/includes/load-service.h +++ b/src/includes/load-service.h @@ -15,11 +15,11 @@ #include #include -#include "dinit-env.h" -#include "dinit-utmp.h" -#include "dinit-util.h" -#include "service-constants.h" -#include "mconfig.h" +#include +#include +#include +#include +#include struct service_flags_t { diff --git a/src/includes/options-processing.h b/src/includes/options-processing.h index 9fe00d65..901007d3 100644 --- a/src/includes/options-processing.h +++ b/src/includes/options-processing.h @@ -3,7 +3,7 @@ #include -#include "service-dir.h" +#include class service_dir_opt { diff --git a/src/includes/proc-service.h b/src/includes/proc-service.h index 10c8bc2c..972b82ae 100644 --- a/src/includes/proc-service.h +++ b/src/includes/proc-service.h @@ -5,9 +5,9 @@ #include #include -#include "baseproc-sys.h" -#include "service.h" -#include "dinit-utmp.h" +#include +#include +#include // This header defines base_proc_service (base process service) and several derivatives, as well as some // utility functions and classes. See service.h for full details of services. diff --git a/src/includes/service-constants.h b/src/includes/service-constants.h index 47aab98f..c8a5d8ff 100644 --- a/src/includes/service-constants.h +++ b/src/includes/service-constants.h @@ -1,7 +1,7 @@ #ifndef SERVICE_CONSTANTS_H #define SERVICE_CONSTANTS_H -#include "mconfig.h" +#include /* Service states */ enum class service_state_t { diff --git a/src/includes/service-listener.h b/src/includes/service-listener.h index 34b64ed0..f6f39a3c 100644 --- a/src/includes/service-listener.h +++ b/src/includes/service-listener.h @@ -1,7 +1,7 @@ #ifndef SERVICE_LISTENER_H #define SERVICE_LISTENER_H -#include "service-constants.h" +#include class service_record; diff --git a/src/includes/service.h b/src/includes/service.h index 3c62ddcb..7401e9f4 100644 --- a/src/includes/service.h +++ b/src/includes/service.h @@ -8,17 +8,17 @@ #include #include -#include "dasynq.h" - -#include "dinit.h" -#include "control.h" -#include "service-listener.h" -#include "service-constants.h" -#include "load-service.h" -#include "dinit-ll.h" -#include "dinit-log.h" -#include "service-dir.h" -#include "dinit-env.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include /* * This header defines service_record, a data record maintaining information about a service, diff --git a/src/tests/Makefile b/src/tests/Makefile index a5bf1cad..8782f994 100644 --- a/src/tests/Makefile +++ b/src/tests/Makefile @@ -4,7 +4,7 @@ ALL_TEST_CXXFLAGS=$(CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_CXXFLAGS_EXTRA) ALL_TEST_LDFLAGS=$(TEST_LDFLAGS) $(TEST_LDFLAGS_EXTRA) objects = tests.o test-dinit.o proctests.o loadtests.o envtests.o test-run-child-proc.o test-bpsys.o -parent_objs = service.o proc-service.o dinit-log.o load-service.o baseproc-service.o dinit-env.o +parent_objs = service.o proc-service.o dinit-log.o load-service.o baseproc-service.o dinit-env.o control.o check: build-tests run-tests @@ -31,10 +31,10 @@ envtests: $(parent_objs) envtests.o test-dinit.o test-bpsys.o test-run-child-pro $(CXX) -o envtests $(parent_objs) envtests.o test-dinit.o test-bpsys.o test-run-child-proc.o $(ALL_TEST_LDFLAGS) $(objects): %.o: %.cc - $(CXX) $(ALL_TEST_CXXFLAGS) -MMD -MP -Iincludes -I../../dasynq/include -I../../build/includes -c $< -o $@ + $(CXX) $(ALL_TEST_CXXFLAGS) -MMD -MP -Itest-includes -I../../dasynq/include -I../../build/includes -I../includes -c $< -o $@ $(parent_objs): %.o: ../%.cc - $(CXX) $(ALL_TEST_CXXFLAGS) -MMD -MP -Iincludes -I../../dasynq/include -I../../build/includes -c $< -o $@ + $(CXX) $(ALL_TEST_CXXFLAGS) -MMD -MP -Itest-includes -I../../dasynq/include -I../../build/includes -I../includes -c $< -o $@ clean: $(MAKE) -C cptests clean diff --git a/src/tests/cptests/Makefile b/src/tests/cptests/Makefile index 59dc9e95..6c0fc168 100644 --- a/src/tests/cptests/Makefile +++ b/src/tests/cptests/Makefile @@ -18,10 +18,10 @@ cptests: cptests.o $(parent_objs) $(parent_test_objs) $(CXX) -o cptests cptests.o $(parent_test_objects) $(parent_objs) $(ALL_TEST_LDFLAGS) $(objects): %.o: %.cc - $(CXX) $(ALL_TEST_CXXFLAGS) -MMD -MP -Iincludes -I../../../dasynq/include -I../../../build/includes -c $< -o $@ + $(CXX) $(ALL_TEST_CXXFLAGS) -MMD -MP -I../test-includes -I../../../dasynq/include -I../../../build/includes -I../../includes -c $< -o $@ $(parent_objs): %.o: ../../%.cc - $(CXX) $(ALL_TEST_CXXFLAGS) -MMD -MP -Iincludes -I../../../dasynq/include -I../../../build/includes -c $< -o $@ + $(CXX) $(ALL_TEST_CXXFLAGS) -MMD -MP -I../test-includes -I../../../dasynq/include -I../../../build/includes -I../../includes -c $< -o $@ clean: rm -f *.o *.d cptests @@ -41,13 +41,13 @@ fuzz_objects = $(foreach obj,$(parent_objs),fuzz-$(obj)) $(MAKE) -C ../../../build all fuzz: ../../../build/includes/mconfig.h fuzz.cc $(fuzz_parent_test_objects) $(fuzz_objects) - clang++ -std=c++11 -g -O1 -Iincludes -I../../../dasynq/include -I../../../build/includes/ -fsanitize=fuzzer,address,undefined,leak fuzz.cc $(fuzz_parent_test_objects) $(fuzz_objects) -o fuzz + clang++ -std=c++11 -g -O1 -I../test-includes -I../../../dasynq/include -I../../../build/includes/ -I../../includes -fsanitize=fuzzer,address,undefined,leak fuzz.cc $(fuzz_parent_test_objects) $(fuzz_objects) -o fuzz $(fuzz_parent_test_objects): fuzz-%.o: ../%.cc - clang -O1 -fsanitize=address,undefined,fuzzer-no-link,leak -MMD -MP -Iincludes -I../../../dasynq/include -I../../../build/includes/ -c $< -o $@ + clang -O1 -fsanitize=address,undefined,fuzzer-no-link,leak -MMD -MP -I../test-includes -I../../../dasynq/include -I../../../build/includes/ -I../../includes -c $< -o $@ $(fuzz_objects): fuzz-%.o: ../../%.cc - clang -O1 -fsanitize=address,undefined,fuzzer-no-link,leak -MMD -MP -Iincludes -I../../../dasynq/include -I../../../build/includes/ -c $< -o $@ + clang -O1 -fsanitize=address,undefined,fuzzer-no-link,leak -MMD -MP -I../test-includes -I../../../dasynq/include -I../../../build/includes/ -I../../includes -c $< -o $@ -include $(objects:.o=.d) diff --git a/src/tests/cptests/cptests.cc b/src/tests/cptests/cptests.cc index 400095f6..0ac0f641 100644 --- a/src/tests/cptests/cptests.cc +++ b/src/tests/cptests/cptests.cc @@ -4,11 +4,11 @@ #include #include -#include "dinit.h" -#include "service.h" -#include "baseproc-sys.h" -#include "proc-service.h" -#include "control.h" +#include +#include +#include +#include +#include #include "../test_service.h" #include "../test_procservice.h" diff --git a/src/tests/cptests/includes/baseproc-sys.h b/src/tests/cptests/includes/baseproc-sys.h deleted file mode 120000 index ad53c2ee..00000000 --- a/src/tests/cptests/includes/baseproc-sys.h +++ /dev/null @@ -1 +0,0 @@ -../../test-includes/baseproc-sys.h \ No newline at end of file diff --git a/src/tests/cptests/includes/control-cmds.h b/src/tests/cptests/includes/control-cmds.h deleted file mode 120000 index 22f553af..00000000 --- a/src/tests/cptests/includes/control-cmds.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/control-cmds.h \ No newline at end of file diff --git a/src/tests/cptests/includes/control.h b/src/tests/cptests/includes/control.h deleted file mode 120000 index 52a4ae54..00000000 --- a/src/tests/cptests/includes/control.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/control.h \ No newline at end of file diff --git a/src/tests/cptests/includes/cpbuffer.h b/src/tests/cptests/includes/cpbuffer.h deleted file mode 120000 index 59a971e2..00000000 --- a/src/tests/cptests/includes/cpbuffer.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/cpbuffer.h \ No newline at end of file diff --git a/src/tests/cptests/includes/dinit-client.h b/src/tests/cptests/includes/dinit-client.h deleted file mode 120000 index efe2bcbf..00000000 --- a/src/tests/cptests/includes/dinit-client.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/dinit-client.h \ No newline at end of file diff --git a/src/tests/cptests/includes/dinit-env.h b/src/tests/cptests/includes/dinit-env.h deleted file mode 120000 index 84172780..00000000 --- a/src/tests/cptests/includes/dinit-env.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/dinit-env.h \ No newline at end of file diff --git a/src/tests/cptests/includes/dinit-ll.h b/src/tests/cptests/includes/dinit-ll.h deleted file mode 120000 index 053d196b..00000000 --- a/src/tests/cptests/includes/dinit-ll.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/dinit-ll.h \ No newline at end of file diff --git a/src/tests/cptests/includes/dinit-log.h b/src/tests/cptests/includes/dinit-log.h deleted file mode 120000 index 921ab242..00000000 --- a/src/tests/cptests/includes/dinit-log.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/dinit-log.h \ No newline at end of file diff --git a/src/tests/cptests/includes/dinit-socket.h b/src/tests/cptests/includes/dinit-socket.h deleted file mode 120000 index 21501035..00000000 --- a/src/tests/cptests/includes/dinit-socket.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/dinit-socket.h \ No newline at end of file diff --git a/src/tests/cptests/includes/dinit-util.h b/src/tests/cptests/includes/dinit-util.h deleted file mode 120000 index 0752f464..00000000 --- a/src/tests/cptests/includes/dinit-util.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/dinit-util.h \ No newline at end of file diff --git a/src/tests/cptests/includes/dinit-utmp.h b/src/tests/cptests/includes/dinit-utmp.h deleted file mode 120000 index 5b96825b..00000000 --- a/src/tests/cptests/includes/dinit-utmp.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/dinit-utmp.h \ No newline at end of file diff --git a/src/tests/cptests/includes/dinit.h b/src/tests/cptests/includes/dinit.h deleted file mode 120000 index fee4a977..00000000 --- a/src/tests/cptests/includes/dinit.h +++ /dev/null @@ -1 +0,0 @@ -../../test-includes/dinit.h \ No newline at end of file diff --git a/src/tests/cptests/includes/load-service.h b/src/tests/cptests/includes/load-service.h deleted file mode 120000 index 3388a2a1..00000000 --- a/src/tests/cptests/includes/load-service.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/load-service.h \ No newline at end of file diff --git a/src/tests/cptests/includes/options-processing.h b/src/tests/cptests/includes/options-processing.h deleted file mode 120000 index e0461f6f..00000000 --- a/src/tests/cptests/includes/options-processing.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/options-processing.h \ No newline at end of file diff --git a/src/tests/cptests/includes/proc-service.h b/src/tests/cptests/includes/proc-service.h deleted file mode 120000 index 2d1bcbc5..00000000 --- a/src/tests/cptests/includes/proc-service.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/proc-service.h \ No newline at end of file diff --git a/src/tests/cptests/includes/service-constants.h b/src/tests/cptests/includes/service-constants.h deleted file mode 120000 index f074d1f5..00000000 --- a/src/tests/cptests/includes/service-constants.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/service-constants.h \ No newline at end of file diff --git a/src/tests/cptests/includes/service-dir.h b/src/tests/cptests/includes/service-dir.h deleted file mode 120000 index 0f830ec9..00000000 --- a/src/tests/cptests/includes/service-dir.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/service-dir.h \ No newline at end of file diff --git a/src/tests/cptests/includes/service-listener.h b/src/tests/cptests/includes/service-listener.h deleted file mode 120000 index 3f607556..00000000 --- a/src/tests/cptests/includes/service-listener.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/service-listener.h \ No newline at end of file diff --git a/src/tests/cptests/includes/service.h b/src/tests/cptests/includes/service.h deleted file mode 120000 index add28d9c..00000000 --- a/src/tests/cptests/includes/service.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/service.h \ No newline at end of file diff --git a/src/tests/cptests/includes/static-string.h b/src/tests/cptests/includes/static-string.h deleted file mode 120000 index 9188764d..00000000 --- a/src/tests/cptests/includes/static-string.h +++ /dev/null @@ -1 +0,0 @@ -../../../includes/static-string.h \ No newline at end of file diff --git a/src/tests/includes/baseproc-sys.h b/src/tests/includes/baseproc-sys.h deleted file mode 120000 index 67d3b95d..00000000 --- a/src/tests/includes/baseproc-sys.h +++ /dev/null @@ -1 +0,0 @@ -../test-includes/baseproc-sys.h \ No newline at end of file diff --git a/src/tests/includes/control-cmds.h b/src/tests/includes/control-cmds.h deleted file mode 120000 index 74112736..00000000 --- a/src/tests/includes/control-cmds.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/control-cmds.h \ No newline at end of file diff --git a/src/tests/includes/control.h b/src/tests/includes/control.h deleted file mode 120000 index 2f75a4a0..00000000 --- a/src/tests/includes/control.h +++ /dev/null @@ -1 +0,0 @@ -../test-includes/control.h \ No newline at end of file diff --git a/src/tests/includes/cpbuffer.h b/src/tests/includes/cpbuffer.h deleted file mode 120000 index fcb804ed..00000000 --- a/src/tests/includes/cpbuffer.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/cpbuffer.h \ No newline at end of file diff --git a/src/tests/includes/dinit-client.h b/src/tests/includes/dinit-client.h deleted file mode 120000 index bf03433e..00000000 --- a/src/tests/includes/dinit-client.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/dinit-client.h \ No newline at end of file diff --git a/src/tests/includes/dinit-env.h b/src/tests/includes/dinit-env.h deleted file mode 120000 index ca515e42..00000000 --- a/src/tests/includes/dinit-env.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/dinit-env.h \ No newline at end of file diff --git a/src/tests/includes/dinit-ll.h b/src/tests/includes/dinit-ll.h deleted file mode 120000 index 766a6074..00000000 --- a/src/tests/includes/dinit-ll.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/dinit-ll.h \ No newline at end of file diff --git a/src/tests/includes/dinit-log.h b/src/tests/includes/dinit-log.h deleted file mode 120000 index 66d6b2d7..00000000 --- a/src/tests/includes/dinit-log.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/dinit-log.h \ No newline at end of file diff --git a/src/tests/includes/dinit-socket.h b/src/tests/includes/dinit-socket.h deleted file mode 120000 index db873825..00000000 --- a/src/tests/includes/dinit-socket.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/dinit-socket.h \ No newline at end of file diff --git a/src/tests/includes/dinit-util.h b/src/tests/includes/dinit-util.h deleted file mode 120000 index ad5e740e..00000000 --- a/src/tests/includes/dinit-util.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/dinit-util.h \ No newline at end of file diff --git a/src/tests/includes/dinit-utmp.h b/src/tests/includes/dinit-utmp.h deleted file mode 120000 index 88c353ce..00000000 --- a/src/tests/includes/dinit-utmp.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/dinit-utmp.h \ No newline at end of file diff --git a/src/tests/includes/dinit.h b/src/tests/includes/dinit.h deleted file mode 120000 index 1c5925ec..00000000 --- a/src/tests/includes/dinit.h +++ /dev/null @@ -1 +0,0 @@ -../test-includes/dinit.h \ No newline at end of file diff --git a/src/tests/includes/load-service.h b/src/tests/includes/load-service.h deleted file mode 120000 index 3e2d7923..00000000 --- a/src/tests/includes/load-service.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/load-service.h \ No newline at end of file diff --git a/src/tests/includes/options-processing.h b/src/tests/includes/options-processing.h deleted file mode 120000 index 7dcf1bde..00000000 --- a/src/tests/includes/options-processing.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/options-processing.h \ No newline at end of file diff --git a/src/tests/includes/proc-service.h b/src/tests/includes/proc-service.h deleted file mode 120000 index 470938cf..00000000 --- a/src/tests/includes/proc-service.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/proc-service.h \ No newline at end of file diff --git a/src/tests/includes/service-constants.h b/src/tests/includes/service-constants.h deleted file mode 120000 index d84093fc..00000000 --- a/src/tests/includes/service-constants.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/service-constants.h \ No newline at end of file diff --git a/src/tests/includes/service-dir.h b/src/tests/includes/service-dir.h deleted file mode 120000 index 4e5b7b38..00000000 --- a/src/tests/includes/service-dir.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/service-dir.h \ No newline at end of file diff --git a/src/tests/includes/service-listener.h b/src/tests/includes/service-listener.h deleted file mode 120000 index 525a9291..00000000 --- a/src/tests/includes/service-listener.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/service-listener.h \ No newline at end of file diff --git a/src/tests/includes/service.h b/src/tests/includes/service.h deleted file mode 120000 index 7cf7d7e4..00000000 --- a/src/tests/includes/service.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/service.h \ No newline at end of file diff --git a/src/tests/includes/static-string.h b/src/tests/includes/static-string.h deleted file mode 120000 index a5c96ebb..00000000 --- a/src/tests/includes/static-string.h +++ /dev/null @@ -1 +0,0 @@ -../../includes/static-string.h \ No newline at end of file diff --git a/src/tests/test-includes/control.h b/src/tests/test-includes/control.h deleted file mode 100644 index 4a8c36ee..00000000 --- a/src/tests/test-includes/control.h +++ /dev/null @@ -1,14 +0,0 @@ -// dummy control.h - -#include "dinit.h" - -class service_set; - -class control_conn_t -{ - public: - control_conn_t(eventloop_t &loop, service_set * services_p, int fd) - { - // active_control_conns++; - } -};