rpms/util-vserver/devel personality.gdb, NONE, 1.1 util-vserver-0.30.209-debug.patch, NONE, 1.1 util-vserver.spec, 1.11, 1.12
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Tue Nov 1 17:30:57 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20295
Modified Files:
util-vserver.spec
Added Files:
personality.gdb util-vserver-0.30.209-debug.patch
Log Message:
added lot of debug stuff to find out the reason for the 'make check'
failure on PPC (cflags & personlity get killed there)
--- NEW FILE personality.gdb ---
r
bt
util-vserver-0.30.209-debug.patch:
--- NEW FILE util-vserver-0.30.209-debug.patch ---
Index: lib/testsuite/personality.c
===================================================================
RCS file: /cvsroot/util-vserver/util-vserver/lib/testsuite/personality.c,v
retrieving revision 1.1
diff -u -p -r1.1 personality.c
--- lib/testsuite/personality.c 28 Apr 2005 17:54:57 -0000 1.1
+++ lib/testsuite/personality.c 1 Nov 2005 17:13:28 -0000
@@ -27,16 +27,42 @@
#include <unistd.h>
#include <linux/personality.h>
+#if 1
+# include <fcntl.h>
-#define TEST_T2PF(X,Y,Z) assert(vc_text2personalityflag(X,Y)==Z)
-#define TEST_PF2T(Y,X) { \
+# define ENSC_STATUSX(X) do { \
+ int status_fd=open("personality.status", O_WRONLY|O_CREAT|O_NOFOLLOW, 0644); \
+ WRITE_MSG(status_fd, __FILE__ ":" ASSERT_STR(__LINE__) " " X "\n"); \
+ close(status_fd); \
+} while (false)
+# define ENSC_STATUS(X) \
+ WRITE_MSG(2, __FILE__ ":" ASSERT_STR(__LINE__) " " X "\n");
+
+#else
+# define ENSC_STATUS(X) do {} while (false)
+#endif
+
+#define ENSC_STATUS_START ENSC_STATUS("{"); {
+#define ENSC_STATUS_END } ENSC_STATUS("}");
+
+#define TEST_T2PF(X,Y,Z) do { \
+ ENSC_STATUS_START; \
+ assert(vc_text2personalityflag(X,Y)==Z); \
+ ENSC_STATUS_END; \
+ } while (false)
+
+
+#define TEST_PF2T(Y,X) do { \
+ ENSC_STATUS_START; \
uint_least32_t x = (X); \
char const *rc=vc_lopersonality2text(&x); \
assert((rc==0 && Y==0) || (rc!=0 && Y!=0)); \
if (rc!=0 && Y!=0) assert(strcmp(rc, Y ? Y : "")==0); \
- }
+ ENSC_STATUS_END; \
+ } while (false)
-#define TEST_LIST(STR,LEN,EXP_RES,EXP_PERS,ERR_POS,ERR_LEN) { \
+#define TEST_LIST(STR,LEN,EXP_RES,EXP_PERS,ERR_POS,ERR_LEN) do { \
+ ENSC_STATUS_START; \
struct vc_err_listparser err; \
char buf[] = STR; \
volatile int res; \
@@ -47,12 +73,16 @@
assert(err.len==ERR_LEN); \
if (ERR_POS==-1) assert(err.ptr==0); \
else assert(err.ptr==buf+(ERR_POS)); \
- }
+ ENSC_STATUS_END; \
+ } while (false)
-#define TEST_T2PT(X,Y,Z) assert(vc_str2personalitytype(X,Y)==Z)
-
+#define TEST_T2PT(X,Y,Z) do { \
+ ENSC_STATUS_START; \
+ assert(vc_str2personalitytype(X,Y)==Z); \
+ ENSC_STATUS_END; \
+ } while (false)
int main()
Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- util-vserver.spec 30 Oct 2005 16:21:43 -0000 1.11
+++ util-vserver.spec 1 Nov 2005 17:30:55 -0000 1.12
@@ -23,13 +23,15 @@
Summary: Linux virtual server utilities
Name: util-vserver
Version: 0.30.209
-Release: %release_func 2
+Release: %release_func 3
License: GPL
Group: System Environment/Base
URL: http://savannah.nongnu.org/projects/util-vserver/
Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2
Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc
+Source2: personlity.gdb
Patch0: util-vserver-0.30.209-dietfix.patch
+Patch1: util-vserver-0.30.209-debug.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: init(%name)
Requires: %name-core = %version-%release
@@ -41,6 +43,7 @@
BuildRequires: gcc-c++ wget which diffutils
BuildRequires: e2fsprogs-devel beecrypt-devel
BuildRequires: doxygen tetex-latex
+BuildRequires: gdb recode
Requires(post): %__chattr
Requires(pre): %pkglibdir
Requires(postun): %pkglibdir
@@ -172,7 +175,7 @@
%prep
%setup -q
%patch0 -p1 -b .dietfix
-
+%patch1 -p0 -b .debug
%build
%configure --with-initrddir=%_initrddir --enable-release \
@@ -194,8 +197,15 @@
%check || :
-%__make check
-
+%__make lib/testsuite/personality
+gdb --batch --command=%SOURCE2 ./lib/testsuite/personality || :
+res=0
+%__make check || res=$?
+dmesg
+test $res -eq 0 || {
+ recode data..base64 <lib/testsuite/personality
+ false
+}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -341,6 +351,10 @@
%changelog
+* Tue Nov 1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.209-%release_func 3
+- added lot of debug stuff to find out the reason for the 'make check'
+ failure on PPC (cflags & personlity get killed there)
+
* Sun Oct 30 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.209-2
- made sure that ensc_fmt/* it compiled with dietlibc. Else, it will
fail with the stack-protector in FC5's gcc
More information about the fedora-extras-commits
mailing list