Fix build to work with --disable-unittests again

Makefile.am

@@ -66,6 +66,7 @@ TOR_UTIL_LIBS = \
 
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
+if UNITTESTS_ENABLED
 TOR_UTIL_TESTING_LIBS = \
 	src/lib/libtor-process-testing.a \
 	src/lib/libtor-time-testing.a \
@@ -90,6 +91,7 @@ TOR_UTIL_TESTING_LIBS = \
 	src/lib/libtor-err-testing.a \
 	src/lib/libtor-intmath.a \
 	src/lib/libtor-ctime-testing.a
+endif
 
 # Internal crypto libraries used in Tor
 TOR_CRYPTO_LIBS = \
@@ -100,11 +102,13 @@ TOR_CRYPTO_LIBS = \
 
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
+if UNITTESTS_ENABLED
 TOR_CRYPTO_TESTING_LIBS = \
 	src/lib/libtor-tls-testing.a \
 	src/lib/libtor-crypt-ops-testing.a \
 	$(LIBKECCAK_TINY) \
 	$(LIBDONNA)
+endif
 
 # All static libraries used to link tor.
 TOR_INTERNAL_LIBS = \
@@ -118,6 +122,7 @@ TOR_INTERNAL_LIBS = \
 
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
+if UNITTESTS_ENABLED
 TOR_INTERNAL_TESTING_LIBS = \
 	src/core/libtor-app-testing.a \
 	src/lib/libtor-compress-testing.a \
@@ -126,6 +131,7 @@ TOR_INTERNAL_TESTING_LIBS = \
 	$(TOR_UTIL_TESTING_LIBS) \
 	src/trunnel/libor-trunnel-testing.a \
 	src/lib/libtor-trace.a
+endif
 
 # All libraries used to link tor-cov
 

changes/bug26789

@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+     - Update build system so that tor builds again with
+       --disable-unittests after recent refactoring efforts.
+       Fixes bug 26789; bugfix on 0.3.4.3-alpha.

scripts/codegen/fuzzing_include_am.py

@@ -84,6 +84,7 @@ def get_id_name(s):
 for fuzzer in FUZZERS:
     idname = get_id_name(fuzzer)
     print("""\
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_{name}_SOURCES = \\
 	src/test/fuzz/fuzzing_common.c \\
 	src/test/fuzz/fuzz_{name}.c
@@ -91,11 +92,14 @@ src_test_fuzz_fuzz_{name}_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_{name}_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_{name}_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_{name}_LDADD = $(FUZZING_LIBS)
+endif
 """.format(name=idname))
 
+print("if UNITTESTS_ENABLED")
 print("FUZZERS = \\")
 print(" \\\n".join("\tsrc/test/fuzz/fuzz-{name}".format(name=fuzzer)
                    for fuzzer in FUZZERS))
+print("endif")
 
 print("\n# ===== libfuzzer")
 print("\nif LIBFUZZER_ENABLED")
@@ -103,12 +107,14 @@ print("\nif LIBFUZZER_ENABLED")
 for fuzzer in FUZZERS:
     idname = get_id_name(fuzzer)
     print("""\
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_{name}_SOURCES = \\
 	$(src_test_fuzz_fuzz_{name}_SOURCES)
 src_test_fuzz_lf_fuzz_{name}_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_{name}_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_{name}_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_{name}_LDADD = $(LIBFUZZER_LIBS)
+endif
 """.format(name=idname))
 
 print("LIBFUZZER_FUZZERS = \\")
@@ -126,10 +132,12 @@ print("if OSS_FUZZ_ENABLED")
 for fuzzer in FUZZERS:
     idname = get_id_name(fuzzer)
     print("""\
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_{name}_a_SOURCES = \\
 	$(src_test_fuzz_fuzz_{name}_SOURCES)
 src_test_fuzz_liboss_fuzz_{name}_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_{name}_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 """.format(name=idname))
 
 print("OSS_FUZZ_FUZZERS = \\")

src/test/fuzz/include.am

@@ -32,6 +32,7 @@ LIBOSS_FUZZ_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ
 LIBOSS_FUZZ_CFLAGS = $(FUZZING_CFLAGS)
 
 # ===== AFL fuzzers
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_consensus_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_consensus.c
@@ -39,7 +40,9 @@ src_test_fuzz_fuzz_consensus_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_consensus_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_consensus_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_consensus_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_descriptor_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_descriptor.c
@@ -47,7 +50,9 @@ src_test_fuzz_fuzz_descriptor_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_descriptor_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_descriptor_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_descriptor_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_diff_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_diff.c
@@ -55,7 +60,9 @@ src_test_fuzz_fuzz_diff_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_diff_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_diff_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_diff_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_diff_apply_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_diff_apply.c
@@ -63,7 +70,9 @@ src_test_fuzz_fuzz_diff_apply_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_diff_apply_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_diff_apply_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_diff_apply_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_extrainfo_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_extrainfo.c
@@ -71,7 +80,9 @@ src_test_fuzz_fuzz_extrainfo_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_extrainfo_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_extrainfo_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_extrainfo_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_hsdescv2_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_hsdescv2.c
@@ -79,7 +90,9 @@ src_test_fuzz_fuzz_hsdescv2_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_hsdescv3_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_hsdescv3.c
@@ -87,7 +100,9 @@ src_test_fuzz_fuzz_hsdescv3_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_hsdescv3_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_hsdescv3_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_hsdescv3_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_http_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_http.c
@@ -95,7 +110,9 @@ src_test_fuzz_fuzz_http_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_http_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_http_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_http_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_http_connect_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_http_connect.c
@@ -103,7 +120,9 @@ src_test_fuzz_fuzz_http_connect_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_http_connect_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_http_connect_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_http_connect_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_iptsv2_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_iptsv2.c
@@ -111,7 +130,9 @@ src_test_fuzz_fuzz_iptsv2_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_iptsv2_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_iptsv2_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_iptsv2_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_microdesc_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_microdesc.c
@@ -119,7 +140,9 @@ src_test_fuzz_fuzz_microdesc_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_microdesc_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_microdesc_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_microdesc_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_socks_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_socks.c
@@ -127,7 +150,9 @@ src_test_fuzz_fuzz_socks_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_socks_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_socks_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_socks_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_vrs_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_vrs.c
@@ -135,7 +160,9 @@ src_test_fuzz_fuzz_vrs_CPPFLAGS = $(FUZZING_CPPFLAGS)
 src_test_fuzz_fuzz_vrs_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_vrs_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_vrs_LDADD = $(FUZZING_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 FUZZERS = \
 	src/test/fuzz/fuzz-consensus \
 	src/test/fuzz/fuzz-descriptor \
@@ -150,100 +177,127 @@ FUZZERS = \
 	src/test/fuzz/fuzz-microdesc \
 	src/test/fuzz/fuzz-socks \
 	src/test/fuzz/fuzz-vrs
+endif
 
 # ===== libfuzzer
 
 if LIBFUZZER_ENABLED
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_consensus_SOURCES = \
 	$(src_test_fuzz_fuzz_consensus_SOURCES)
 src_test_fuzz_lf_fuzz_consensus_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_consensus_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_consensus_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_consensus_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_descriptor_SOURCES = \
 	$(src_test_fuzz_fuzz_descriptor_SOURCES)
 src_test_fuzz_lf_fuzz_descriptor_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_descriptor_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_descriptor_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_descriptor_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_diff_SOURCES = \
 	$(src_test_fuzz_fuzz_diff_SOURCES)
 src_test_fuzz_lf_fuzz_diff_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_diff_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_diff_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_diff_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_diff_apply_SOURCES = \
 	$(src_test_fuzz_fuzz_diff_apply_SOURCES)
 src_test_fuzz_lf_fuzz_diff_apply_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_diff_apply_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_diff_apply_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_diff_apply_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_extrainfo_SOURCES = \
 	$(src_test_fuzz_fuzz_extrainfo_SOURCES)
 src_test_fuzz_lf_fuzz_extrainfo_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_extrainfo_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_extrainfo_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_extrainfo_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_hsdescv2_SOURCES = \
 	$(src_test_fuzz_fuzz_hsdescv2_SOURCES)
 src_test_fuzz_lf_fuzz_hsdescv2_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \
 	$(src_test_fuzz_fuzz_hsdescv3_SOURCES)
 src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_hsdescv3_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_hsdescv3_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_hsdescv3_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_http_SOURCES = \
 	$(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_lf_fuzz_http_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_http_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_http_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_http_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_http_connect_SOURCES = \
 	$(src_test_fuzz_fuzz_http_connect_SOURCES)
 src_test_fuzz_lf_fuzz_http_connect_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_http_connect_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_http_connect_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_http_connect_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_iptsv2_SOURCES = \
 	$(src_test_fuzz_fuzz_iptsv2_SOURCES)
 src_test_fuzz_lf_fuzz_iptsv2_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_iptsv2_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_iptsv2_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_iptsv2_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_microdesc_SOURCES = \
 	$(src_test_fuzz_fuzz_microdesc_SOURCES)
 src_test_fuzz_lf_fuzz_microdesc_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_microdesc_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_microdesc_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_microdesc_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_socks_SOURCES = \
 	$(src_test_fuzz_fuzz_socks_SOURCES)
 src_test_fuzz_lf_fuzz_socks_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_socks_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_socks_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_socks_LDADD = $(LIBFUZZER_LIBS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_vrs_SOURCES = \
 	$(src_test_fuzz_fuzz_vrs_SOURCES)
 src_test_fuzz_lf_fuzz_vrs_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 src_test_fuzz_lf_fuzz_vrs_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_vrs_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_vrs_LDADD = $(LIBFUZZER_LIBS)
+endif
 
 LIBFUZZER_FUZZERS = \
 	src/test/fuzz/lf-fuzz-consensus \
@@ -267,70 +321,96 @@ endif
 # ===== oss-fuzz
 
 if OSS_FUZZ_ENABLED
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_consensus_a_SOURCES = \
 	$(src_test_fuzz_fuzz_consensus_SOURCES)
 src_test_fuzz_liboss_fuzz_consensus_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_consensus_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_descriptor_a_SOURCES = \
 	$(src_test_fuzz_fuzz_descriptor_SOURCES)
 src_test_fuzz_liboss_fuzz_descriptor_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_descriptor_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_diff_a_SOURCES = \
 	$(src_test_fuzz_fuzz_diff_SOURCES)
 src_test_fuzz_liboss_fuzz_diff_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_diff_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_diff_apply_a_SOURCES = \
 	$(src_test_fuzz_fuzz_diff_apply_SOURCES)
 src_test_fuzz_liboss_fuzz_diff_apply_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_diff_apply_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_extrainfo_a_SOURCES = \
 	$(src_test_fuzz_fuzz_extrainfo_SOURCES)
 src_test_fuzz_liboss_fuzz_extrainfo_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_extrainfo_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \
 	$(src_test_fuzz_fuzz_hsdescv2_SOURCES)
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \
 	$(src_test_fuzz_fuzz_hsdescv3_SOURCES)
 src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_hsdescv3_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_http_a_SOURCES = \
 	$(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_http_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_http_connect_a_SOURCES = \
 	$(src_test_fuzz_fuzz_http_connect_SOURCES)
 src_test_fuzz_liboss_fuzz_http_connect_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_http_connect_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_iptsv2_a_SOURCES = \
 	$(src_test_fuzz_fuzz_iptsv2_SOURCES)
 src_test_fuzz_liboss_fuzz_iptsv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_iptsv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_microdesc_a_SOURCES = \
 	$(src_test_fuzz_fuzz_microdesc_SOURCES)
 src_test_fuzz_liboss_fuzz_microdesc_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_microdesc_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_socks_a_SOURCES = \
 	$(src_test_fuzz_fuzz_socks_SOURCES)
 src_test_fuzz_liboss_fuzz_socks_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_socks_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
+if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_vrs_a_SOURCES = \
 	$(src_test_fuzz_fuzz_vrs_SOURCES)
 src_test_fuzz_liboss_fuzz_vrs_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_vrs_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+endif
 
 OSS_FUZZ_FUZZERS = \
 	src/test/fuzz/liboss-fuzz-consensus.a \

src/test/include.am

@@ -321,6 +321,7 @@ src_test_test_hs_ntor_cl_AM_CPPFLAGS =	       \
 	$(AM_CPPFLAGS)
 
 
+if UNITTESTS_ENABLED
 noinst_PROGRAMS += src/test/test-bt-cl
 src_test_test_bt_cl_SOURCES = src/test/test_bt_cl.c
 src_test_test_bt_cl_LDADD = \
@@ -330,6 +331,7 @@ src_test_test_bt_cl_LDADD = \
 	@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@
 src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS)
+endif
 
 EXTRA_DIST += \
 	src/test/bt_test.py \