From 99d168a532894cafd6648547c1ac30dff2a62c43 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 5 May 2018 17:18:22 +0200 Subject: unit tests: Fix build and re-enable them. --- tests/Makefile.am | 154 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 52 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index e69b0ab..29b0a98 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,74 +1,124 @@ +NULL = + CLEANFILES = DISTCLEANFILES = EXTRA_DIST = -TESTS = \ - test-freerdpclient-wrapper +TESTS = \ + test-freerdp2-wrapper \ + $(NULL) + +check_PROGRAMS = \ + test-freerdp2-auth \ + $(TESTS) \ + $(NULL) + +CLEANFILES += \ + test-freerdp2-auth \ + $(TESTS) \ + $(NULL) -check_PROGRAMS = \ - test-freerdp-auth \ - $(TESTS) +AM_CPPFLAGS = $(GTEST_CPPFLAGS) \ + $(REMOTE_APPS_MANAGER_CFLAGS) \ + -I${top_srcdir}/src -Wall -Werror \ + $(NULL) -AM_CPPFLAGS = $(GTEST_CPPFLAGS) \ - $(REMOTE_APPS_MANAGER_CFLAGS) \ - -I${top_srcdir}/src -Wall -Werror -AM_CXXFLAGS = $(GTEST_CXXFLAGS) \ - $(REMOTE_APPS_MANAGER_CFLAGS) +AM_CXXFLAGS = $(GTEST_CXXFLAGS) \ + $(REMOTE_APPS_MANAGER_CFLAGS) \ + $(NULL) -AM_CFLAGS = \ - -Wall \ - -g +AM_CFLAGS = \ + -Wall \ + -g \ + $(NULL) ########################## # Google Test Test Suite # ########################## -check_LIBRARIES = libgtest.a - -nodist_libgtest_a_SOURCES = \ - $(GTEST_SOURCE)/src/gtest-all.cc \ - $(GTEST_SOURCE)/src/gtest_main.cc - -libgtest_a_CPPFLAGS = \ - $(GTEST_CPPFLAGS) -w \ - $(AM_CPPFLAGS) -libgtest_a_CXXFLAGS = \ - $(AM_CXXFLAGS) +check_LIBRARIES = libgtest.a libgtest_main.a + +gtest-all.cc: + cp $(GTEST_SOURCE)/src/gtest-all.cc . + +gtest_main.cc: + cp $(GTEST_SOURCE)/src/gtest_main.cc . + +CLEANFILES += \ + gtest-all.cc \ + gtest_main.cc \ + $(NULL) + +nodist_libgtest_a_SOURCES = \ + gtest-all.cc \ + $(NULL) +nodist_libgtest_main_a_SOURCES = \ + gtest_main.cc \ + $(NULL) + +libgtest_a_CPPFLAGS = \ + $(GTEST_CPPFLAGS) -w \ + $(AM_CPPFLAGS) \ + $(NULL) +libgtest_main_a_CPPFLAGS = \ + $(GTEST_CPPFLAGS) -w \ + $(AM_CPPFLAGS) \ + $(NULL) + +libgtest_a_CXXFLAGS = \ + $(AM_CXXFLAGS) \ + $(NULL) +libgtest_main_a_CXXFLAGS = \ + $(AM_CXXFLAGS) \ + $(NULL) ########################## # Wrapper ########################## -test_freerdp_wrapper: test-freerdp-auth - -test_freerdpclient_wrapper_SOURCES = \ - mock_pam.c mock_pam.h \ - mock_guest.c mock_guest.h \ - test-freerdp-wrapper.cc - -test_freerdpclient_wrapper_LDADD = \ - $(top_builddir)/src/libfreerdp2core.la \ - libgtest.a - -test_freerdpclient_wrapper_CFLAGS = \ - $(AM_CXXFLAGS) \ - -I${top_srcdir}/src - -test_freerdpclient_wrapper_CXXFLAGS = \ - $(AM_CXXFLAGS) \ - -I${top_srcdir}/src - -test_freerdpclient_wrapper_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DAUTH_CHECK="\"$(abs_builddir)/test-freerdp-auth\"" \ - -DLIBPAM_COMPILE - -test_freerdpclient_wrapper_LDFLAGS = \ - -pthread +test_freerdp2_wrapper: test-freerdp2-auth + +test_freerdp2_wrapper_SOURCES = \ + mock_pam.c mock_pam.h \ + mock_guest.c mock_guest.h \ + test-freerdp2-wrapper.cc \ + $(NULL) + +test_freerdp2_wrapper_LDADD = \ + libgtest.a libgtest_main.a \ + ${top_srcdir}/src/pam_freerdp2.la \ + $(FREERDP2_LIBS) \ + $(WINPR2_LIBS) \ + $(NULL) + +test_freerdp2_wrapper_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I${top_srcdir}/include \ + -I${top_srcdir}/src \ + $(GTEST_CPPFLAGS) \ + $(FREERDP2_CPPFLAGS) \ + $(WINPR2_CPPFLAGS) \ + $(NULL) + +test_freerdp2_wrapper_CXXFLAGS = \ + $(AM_CXXFLAGS) \ + -DAUTH_CHECK="\"$(abs_builddir)/test-freerdp2-auth\"" \ + $(GTEST_CXXFLAGS) \ + $(FREERDP2_CXXFLAGS) \ + $(WINPR2_CXXFLAGS) \ + $(NULL) + +test_freerdp2_wrapper_LDFLAGS = \ + $(GTEST_LDFLAGS) \ + $(FREERDP2_LDFLAGS) \ + $(WINPR2_LDFLAGS) \ + -pthread \ + $(NULL) ########################## # Auth tool ########################## -test_freerdp_auth_SOURCES = \ - test-freerdp-auth.c +test_freerdp2_auth_SOURCES = \ + test-freerdp2-auth.c \ + $(NULL) -- cgit v1.2.3