From e05ed11d50512cddc6e3ed1c3ce0bdfdf8c787fa Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 16 Dec 2020 22:38:42 +0000 Subject: [PATCH] tests: Disable C unit tests These link to librpmostreepriv.la which will be going away. I think we should basically focus on moving code into Rust which has a solid solution for this in `#[test]` and debug vs release builds etc. --- Makefile-tests.am | 65 ++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/Makefile-tests.am b/Makefile-tests.am index db1efa92..48bf8661 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -20,38 +20,39 @@ endif GITIGNOREFILES += ssh-config ansible-inventory.yml vmcheck-logs/ test-compose-logs/ tests/vmcheck/image.qcow2 -testbin_cppflags = $(AM_CPPFLAGS) -I $(srcdir)/src/lib -I $(srcdir)/src/libpriv -I $(srcdir)/libglnx -I $(srcdir)/tests/common -testbin_cflags = $(AM_CFLAGS) -fvisibility=hidden $(PKGDEP_RPMOSTREE_CFLAGS) -testbin_ldadd = $(PKGDEP_RPMOSTREE_LIBS) librpmostree-1.la librpmostreepriv.la -lstdc++ - -noinst_LTLIBRARIES += libtest.la -libtest_la_SOURCES = tests/common/libtest.c -libtest_la_CPPFLAGS = $(testbin_cppflags) -libtest_la_CFLAGS = $(testbin_cflags) -libtest_la_LIBADD = $(testbin_ldadd) - -tests_check_jsonutil_CPPFLAGS = $(testbin_cppflags) -tests_check_jsonutil_CFLAGS = $(testbin_cflags) -tests_check_jsonutil_LDADD = $(testbin_ldadd) libtest.la - -tests_check_postprocess_CPPFLAGS = $(testbin_cppflags) -tests_check_postprocess_CFLAGS = $(testbin_cflags) -tests_check_postprocess_LDADD = $(testbin_ldadd) libtest.la - -tests_check_test_utils_CPPFLAGS = $(testbin_cppflags) -tests_check_test_utils_CFLAGS = $(testbin_cflags) -tests_check_test_utils_LDADD = $(testbin_ldadd) libtest.la - -tests_check_test_sysusers_CPPFLAGS = $(testbin_cppflags) -tests_check_test_sysusers_CFLAGS = $(testbin_cflags) -tests_check_test_sysusers_LDADD = $(testbin_ldadd) libtest.la - -uninstalled_test_programs = \ - tests/check/jsonutil \ - tests/check/postprocess \ - tests/check/test-utils \ - tests/check/test-sysusers \ - $(NULL) +# Disabled for now because we dropped librpmostreepriv.la +# testbin_cppflags = $(AM_CPPFLAGS) -I $(srcdir)/src/lib -I $(srcdir)/src/libpriv -I $(srcdir)/libglnx -I $(srcdir)/tests/common +# testbin_cflags = $(AM_CFLAGS) -fvisibility=hidden $(PKGDEP_RPMOSTREE_CFLAGS) +# testbin_ldadd = $(PKGDEP_RPMOSTREE_LIBS) librpmostree-1.la librpmostreepriv.la -lstdc++ +# +# noinst_LTLIBRARIES += libtest.la +# libtest_la_SOURCES = tests/common/libtest.c +# libtest_la_CPPFLAGS = $(testbin_cppflags) +# libtest_la_CFLAGS = $(testbin_cflags) +# libtest_la_LIBADD = $(testbin_ldadd) +# +# tests_check_jsonutil_CPPFLAGS = $(testbin_cppflags) +# tests_check_jsonutil_CFLAGS = $(testbin_cflags) +# tests_check_jsonutil_LDADD = $(testbin_ldadd) libtest.la +# +# tests_check_postprocess_CPPFLAGS = $(testbin_cppflags) +# tests_check_postprocess_CFLAGS = $(testbin_cflags) +# tests_check_postprocess_LDADD = $(testbin_ldadd) libtest.la +# +# tests_check_test_utils_CPPFLAGS = $(testbin_cppflags) +# tests_check_test_utils_CFLAGS = $(testbin_cflags) +# tests_check_test_utils_LDADD = $(testbin_ldadd) libtest.la +# +# tests_check_test_sysusers_CPPFLAGS = $(testbin_cppflags) +# tests_check_test_sysusers_CFLAGS = $(testbin_cflags) +# tests_check_test_sysusers_LDADD = $(testbin_ldadd) libtest.la +# +# uninstalled_test_programs = \ +# tests/check/jsonutil \ +# tests/check/postprocess \ +# tests/check/test-utils \ +# tests/check/test-sysusers \ +# $(NULL) uninstalled_test_scripts = \ tests/check/test-lib-introspection.sh \