libcgroup/libcgroup-tests-unbundle-gtest.patch
Nikola Forró cc62f90cff new upstream release 2.0
- resolves: #1953968
2021-05-17 16:15:55 +02:00

33 lines
1.2 KiB
Diff

diff --git a/tests/gunit/Makefile.am b/tests/gunit/Makefile.am
index 654002c..96399e9 100644
--- a/tests/gunit/Makefile.am
+++ b/tests/gunit/Makefile.am
@@ -22,8 +22,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/tools \
- -I$(top_builddir)/googletest/googletest/include \
- -I$(top_builddir)/googletest/googletest \
-std=c++11 \
-Wno-write-strings \
-DSTATIC= \
@@ -31,10 +29,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \
LDADD = $(top_builddir)/src/.libs/libcgroupfortesting.la \
$(top_builddir)/src/tools/.libs/libcgset.la
-EXTRA_DIST = $(top_srcdir)/googletest/googletest/libgtest.so \
- $(top_srcdir)/googletest/googletest/libgtest_main.so \
- $(top_srcdir)/googletest/googletest/include \
- libcgroup_unittest.map
+EXTRA_DIST = libcgroup_unittest.map
check_PROGRAMS = gtest
TESTS = gtest
@@ -56,5 +51,4 @@ gtest_SOURCES = gtest.cpp \
014-cgroupv2_get_subtree_control.cpp \
015-cgroupv2_controller_enabled.cpp \
016-cgset_parse_r_flag.cpp
-gtest_LDFLAGS = -L$(top_builddir)/googletest/googletest -l:libgtest.so \
- -rpath $(abs_top_builddir)/googletest/googletest
+gtest_LDFLAGS = -l:libgtest.so