keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Disable C unit tests

Browse Source 
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.
This commit is contained in:
Colin Walters 2020-12-16 22:38:42 +00:00 committed by OpenShift Merge Robot
parent ec5bdca9e5
commit e05ed11d50
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
Makefile-tests.am
View File

@ -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 \