| 1 |
xmw 12/02/08 04:43:23 |
| 2 |
|
| 3 |
Added: elektra-0.7.1-test.patch elektra-0.7.1-ltdl.patch |
| 4 |
Log: |
| 5 |
Fix tests, disable test_backendhelpers test (bug 402619). |
| 6 |
|
| 7 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/elektra/files/elektra-0.7.1-test.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/files/elektra-0.7.1-test.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/files/elektra-0.7.1-test.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: elektra-0.7.1-test.patch |
| 16 |
=================================================================== |
| 17 |
--- elektra-0.7.1/src/bindings/cpp/tests/test_kdb.cpp |
| 18 |
+++ elektra-0.7.1/src/bindings/cpp/tests/test_kdb.cpp |
| 19 |
@@ -1,4 +1,5 @@ |
| 20 |
#include <tests.h> |
| 21 |
+#include <stdio.h> |
| 22 |
|
| 23 |
void test_kdbGetSet() |
| 24 |
{ |
| 25 |
--- elektra-0.7.1/src/bindings/cpp/tests/test_ks.cpp |
| 26 |
+++ elektra-0.7.1/src/bindings/cpp/tests/test_ks.cpp |
| 27 |
@@ -1,4 +1,5 @@ |
| 28 |
#include <tests.h> |
| 29 |
+#include <stdio.h> |
| 30 |
|
| 31 |
void test_ksnew() |
| 32 |
{ |
| 33 |
--- elektra-0.7.1/src/bindings/cpp/tests/test_key.cpp |
| 34 |
+++ elektra-0.7.1/src/bindings/cpp/tests/test_key.cpp |
| 35 |
@@ -1,4 +1,5 @@ |
| 36 |
#include <tests.h> |
| 37 |
+#include <stdio.h> |
| 38 |
|
| 39 |
void test_keynew() |
| 40 |
{ |
| 41 |
--- elektra-0.7.1/src/bindings/cpp/tests/Makefile.am |
| 42 |
+++ elektra-0.7.1/src/bindings/cpp/tests/Makefile.am |
| 43 |
@@ -10,13 +10,13 @@ |
| 44 |
endif |
| 45 |
|
| 46 |
test_key_SOURCES = test_key.cpp tests.h tests.cpp |
| 47 |
-test_key_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a |
| 48 |
+test_key_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a |
| 49 |
|
| 50 |
test_ks_SOURCES = test_ks.cpp tests.h tests.cpp |
| 51 |
-test_ks_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a |
| 52 |
+test_ks_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a |
| 53 |
|
| 54 |
test_kdb_SOURCES = test_kdb.cpp tests.h tests.cpp |
| 55 |
-test_kdb_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a |
| 56 |
+test_kdb_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a |
| 57 |
|
| 58 |
../libelektra-cpp.a: |
| 59 |
cd .. && $(MAKE) libelektra-cpp.a |
| 60 |
--- elektra-0.7.1/tests/Makefile.am |
| 61 |
+++ elektra-0.7.1/tests/Makefile.am |
| 62 |
@@ -1,10 +1,10 @@ |
| 63 |
AM_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS) |
| 64 |
AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LTDLINCL) |
| 65 |
|
| 66 |
-TESTS = test_key test_ks test_kdb test_xml test_validate.sh test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_backendhelpers test_script.sh test_type |
| 67 |
+TESTS = test_key test_ks test_kdb test_xml test_validate.sh test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_script.sh test_type |
| 68 |
#TESTS = test_backendhelpers |
| 69 |
|
| 70 |
-check_PROGRAMS = test_key test_ks test_kdb test_xml test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_backendhelpers test_type print_info |
| 71 |
+check_PROGRAMS = test_key test_ks test_kdb test_xml test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_type print_info |
| 72 |
#check_PROGRAMS = test_backendhelpers |
| 73 |
|
| 74 |
if VALGRINDTESTS |
| 75 |
@@ -19,49 +19,49 @@ |
| 76 |
rm -f *.gcno *.gcda *.gcno |
| 77 |
|
| 78 |
test_key_SOURCES = test_key.c tests.h tests.c |
| 79 |
-test_key_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 80 |
+test_key_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 81 |
|
| 82 |
test_ks_SOURCES = test_ks.c tests.h tests.c |
| 83 |
-test_ks_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 84 |
+test_ks_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 85 |
|
| 86 |
test_kdb_SOURCES = test_kdb.c tests.h tests.c |
| 87 |
-test_kdb_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 88 |
+test_kdb_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 89 |
|
| 90 |
test_xml_SOURCES = test_xml.c tests.h tests.c |
| 91 |
-test_xml_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 92 |
+test_xml_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 93 |
|
| 94 |
test_getset_SOURCES = test_getset.c tests.h tests.c |
| 95 |
-test_getset_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 96 |
+test_getset_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 97 |
|
| 98 |
test_trie_SOURCES = test_trie.c tests.h tests.c |
| 99 |
-test_trie_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 100 |
+test_trie_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 101 |
|
| 102 |
test_mount_SOURCES = test_mount.c tests.h tests.c |
| 103 |
-test_mount_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 104 |
+test_mount_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 105 |
|
| 106 |
test_cap_SOURCES = test_cap.c tests.h tests.c |
| 107 |
-test_cap_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 108 |
+test_cap_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 109 |
|
| 110 |
test_stream_SOURCES = test_stream.c tests.h tests.c |
| 111 |
-test_stream_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 112 |
+test_stream_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 113 |
|
| 114 |
test_serialize_SOURCES = test_serialize.c tests.h tests.c |
| 115 |
-test_serialize_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 116 |
+test_serialize_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 117 |
|
| 118 |
test_split_SOURCES = test_split.c tests.h tests.c |
| 119 |
-test_split_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 120 |
+test_split_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 121 |
|
| 122 |
test_internals_SOURCES = test_internals.c tests.h tests.c |
| 123 |
-test_internals_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 124 |
+test_internals_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 125 |
|
| 126 |
test_backendhelpers_SOURCES = test_backendhelpers.c tests.h tests.c |
| 127 |
-test_backendhelpers_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 128 |
+test_backendhelpers_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 129 |
|
| 130 |
test_type_SOURCES = test_type.c tests.h tests.c |
| 131 |
-test_type_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 132 |
+test_type_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 133 |
|
| 134 |
print_info_SOURCES = print_info.c tests.h tests.c |
| 135 |
-print_info_LDADD = $(privatelibs) ../src/libelektra/libelektra.a |
| 136 |
+print_info_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a |
| 137 |
|
| 138 |
../src/libelektra/libelektra.a: |
| 139 |
cd ../src/libelektra && $(MAKE) libelektra.a |
| 140 |
|
| 141 |
|
| 142 |
|
| 143 |
1.1 app-admin/elektra/files/elektra-0.7.1-ltdl.patch |
| 144 |
|
| 145 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/files/elektra-0.7.1-ltdl.patch?rev=1.1&view=markup |
| 146 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/files/elektra-0.7.1-ltdl.patch?rev=1.1&content-type=text/plain |
| 147 |
|
| 148 |
Index: elektra-0.7.1-ltdl.patch |
| 149 |
=================================================================== |
| 150 |
--- elektra-0.7.1/Makefile.am |
| 151 |
+++ elektra-0.7.1/Makefile.am |
| 152 |
@@ -1,6 +1,6 @@ |
| 153 |
ACLOCAL_AMFLAGS = -I m4 |
| 154 |
|
| 155 |
-SUBDIRS = libltdl src doc benchmarks examples scripts xmlschema tests |
| 156 |
+SUBDIRS = src doc benchmarks examples scripts xmlschema tests |
| 157 |
EXTRA_DIST=elektra.pc elektratools.pc elektracpp.pc elektra.spec elektra.mandriva.spec elektra.xml |
| 158 |
|
| 159 |
pkgconfigdir = $(ulibdir)/pkgconfig |
| 160 |
--- elektra-0.7.1/doc/Makefile.am |
| 161 |
+++ elektra-0.7.1/doc/Makefile.am |
| 162 |
@@ -1,4 +1,5 @@ |
| 163 |
# $Id: elektra-0.7.1-ltdl.patch,v 1.1 2012/02/08 04:43:23 xmw Exp $ |
| 164 |
+develdocDATA_INSTALL = install |
| 165 |
|
| 166 |
EXTRA_DIST=kdb.1.xml elektra.7.xml elektra.5.xml |
| 167 |
EXTRA_DIST+=author.xml bestpract.xml rgexample.xml rgcmd.xml storage.xml overview.xml apiexample.xml api.xml compared.xml garbage.xml html-params.xsl html-titlepage-layout.tpl society.xml storage.xml UPLOAD |
Archives