pmachata pushed to ltrace (master). "Fix test suite warnings"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 14:45:56 UTC 2015
>From 091cc6df51bec89c67e90b878411fb401da3586e Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata at redhat.com>
Date: Wed, 8 Apr 2015 16:45:34 +0200
Subject: Fix test suite warnings
diff --git a/ltrace-0.7.91-testsuite-includes-2.patch b/ltrace-0.7.91-testsuite-includes-2.patch
new file mode 100644
index 0000000..100443a
--- /dev/null
+++ b/ltrace-0.7.91-testsuite-includes-2.patch
@@ -0,0 +1,48 @@
+From 57dbe34ea7aa54b97e11406e1cfb2e427a68779e Mon Sep 17 00:00:00 2001
+From: Petr Machata <pmachata at redhat.com>
+Date: Wed, 8 Apr 2015 16:04:13 +0200
+Subject: [PATCH] Fix warnings in compilation of test-suite cases
+
+---
+ testsuite/ltrace.main/signals.c | 5 +++--
+ testsuite/ltrace.minor/wchar.exp | 3 ++-
+ testsuite/ltrace.torture/signals.c | 5 +++--
+ 3 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/testsuite/ltrace.main/signals.c b/testsuite/ltrace.main/signals.c
+index a02e795..ab23fc7 100644
+--- a/testsuite/ltrace.main/signals.c
++++ b/testsuite/ltrace.main/signals.c
+@@ -2,9 +2,10 @@
+ Objectives : Verify that ltrace can trace user defined signal.
+ This file was written by Yao Qi <qiyao at cn.ibm.com>. */
+
+-#include<stdio.h>
+-#include<signal.h>
++#include <stdio.h>
++#include <signal.h>
+ #include <sys/types.h>
++#include <unistd.h>
+
+ #define LOOP 7
+
+diff --git a/testsuite/ltrace.torture/signals.c b/testsuite/ltrace.torture/signals.c
+index b786c81..c66416e 100644
+--- a/testsuite/ltrace.torture/signals.c
++++ b/testsuite/ltrace.torture/signals.c
+@@ -2,9 +2,10 @@
+ Objectives : Verify that ltrace can trace user defined signal.
+ This file was written by Yao Qi <qiyao at cn.ibm.com>. */
+
+-#include<stdio.h>
+-#include<signal.h>
++#include <stdio.h>
++#include <signal.h>
+ #include <sys/types.h>
++#include <unistd.h>
+
+ #define LOOP 20
+
+--
+2.3.5
+
diff --git a/ltrace-0.7.91-testsuite-includes.patch b/ltrace-0.7.91-testsuite-includes.patch
new file mode 100644
index 0000000..0c5a324
--- /dev/null
+++ b/ltrace-0.7.91-testsuite-includes.patch
@@ -0,0 +1,216 @@
+From 694d19ff14017926454771cbb63a22355b72f1bf Mon Sep 17 00:00:00 2001
+From: Faraz Shahbazker <faraz.shahbazker at imgtec.com>
+Date: Tue, 3 Feb 2015 13:07:55 -0800
+Subject: [PATCH] Fix missing includes and return statements in test sources
+
+Fix warnings while compiling test cases by adding missing #includes and
+return statements. Missing arguments provided for functions wait()/wcswidth()
+---
+ testsuite/ltrace.main/filters.exp | 1 +
+ testsuite/ltrace.main/main-internal.exp | 4 +++-
+ testsuite/ltrace.main/main-threaded.c | 1 +
+ testsuite/ltrace.main/parameters.c | 1 +
+ testsuite/ltrace.main/parameters2.exp | 2 +-
+ testsuite/ltrace.main/parameters3.exp | 2 ++
+ testsuite/ltrace.main/system_call_params.exp | 4 ++++
+ testsuite/ltrace.minor/attach-process.exp | 1 +
+ testsuite/ltrace.minor/libdl-simple.c | 2 ++
+ testsuite/ltrace.minor/time-record.c | 1 +
+ testsuite/ltrace.minor/trace-clone.c | 2 ++
+ testsuite/ltrace.minor/trace-fork.c | 4 +++-
+ testsuite/ltrace.minor/wchar.exp | 3 ++-
+ testsuite/ltrace.torture/vfork-thread.c | 1 +
+ 14 files changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/testsuite/ltrace.main/filters.exp b/testsuite/ltrace.main/filters.exp
+index 988346f..f7f4140 100644
+--- a/testsuite/ltrace.main/filters.exp
++++ b/testsuite/ltrace.main/filters.exp
+@@ -22,6 +22,7 @@ set libfilt1 [ltraceCompile libfilt1.so [ltraceSource c {
+ }]]
+
+ set libfilt2 [ltraceCompile libfilt2.so [ltraceSource c {
++ #include <stdio.h>
+ void func2(void) { puts("func2"); }
+ }]]
+
+diff --git a/testsuite/ltrace.main/main-internal.exp b/testsuite/ltrace.main/main-internal.exp
+index 0ca5e14..112c69b 100644
+--- a/testsuite/ltrace.main/main-internal.exp
++++ b/testsuite/ltrace.main/main-internal.exp
+@@ -19,11 +19,13 @@
+ set bin [ltraceCompile {} [ltraceSource c {
+ __attribute__((noinline)) void this(void) {}
+ __attribute__((noinline)) void that(void) {}
+- int main(int i) {
++ int main() {
++ int i;
+ for (i = 0; i < 12; ++i) {
+ this();
+ that();
+ }
++ return 0;
+ }
+ }]]
+
+diff --git a/testsuite/ltrace.main/parameters.c b/testsuite/ltrace.main/parameters.c
+index a3d8bb5..aa862b9 100644
+--- a/testsuite/ltrace.main/parameters.c
++++ b/testsuite/ltrace.main/parameters.c
+@@ -17,6 +17,7 @@ void func_intptr_ret(int *i);
+ int func_strlen(char*);
+ void func_strfixed(char*);
+ void func_ppp(int***);
++void func_string(char*);
+ void func_stringp(char**);
+ void func_short(short, short);
+ void func_ushort(unsigned short, unsigned short);
+diff --git a/testsuite/ltrace.main/parameters2.exp b/testsuite/ltrace.main/parameters2.exp
+index 9850079..1c7b3b4 100644
+--- a/testsuite/ltrace.main/parameters2.exp
++++ b/testsuite/ltrace.main/parameters2.exp
+@@ -17,7 +17,7 @@
+ # 02110-1301 USA
+
+ set trivial [ltraceCompile {} [ltraceSource c {
+- int main(void) {}
++ int main(void) {return 0;}
+ }]]
+
+ ltraceMatch1 [ltraceRun -L -F [ltraceSource conf {
+diff --git a/testsuite/ltrace.main/parameters3.exp b/testsuite/ltrace.main/parameters3.exp
+index 693c219..f6d9116 100644
+--- a/testsuite/ltrace.main/parameters3.exp
++++ b/testsuite/ltrace.main/parameters3.exp
+@@ -29,8 +29,10 @@ set liba [ltraceCompile liba.so [ltraceSource c {
+ }]]
+
+ set bin [ltraceCompile {} $liba [ltraceSource c {
++ extern void fun(void);
+ int main(void) {
+ fun();
++ return 0;
+ }
+ }]]
+
+diff --git a/testsuite/ltrace.main/system_call_params.exp b/testsuite/ltrace.main/system_call_params.exp
+index 2ccf840..f3a55d2 100644
+--- a/testsuite/ltrace.main/system_call_params.exp
++++ b/testsuite/ltrace.main/system_call_params.exp
+@@ -17,12 +17,15 @@
+ # 02110-1301 USA
+
+ set bin [ltraceCompile {} [ltraceSource c {
++ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
++ #endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/syscall.h> /* For SYS_xxx definitions */
++ #include <sys/mount.h>
+
+ #ifndef SYS_open
+ # if defined(__aarch64__)
+@@ -38,6 +41,7 @@ set bin [ltraceCompile {} [ltraceSource c {
+ syscall(SYS_open, "/some/path", O_RDONLY);
+ write(1, "something", 10);
+ mount("source", "target", "filesystemtype", 0, 0);
++ return 0;
+ }
+ }]]
+
+diff --git a/testsuite/ltrace.minor/attach-process.exp b/testsuite/ltrace.minor/attach-process.exp
+index 2c7d20c..c050f21 100644
+--- a/testsuite/ltrace.minor/attach-process.exp
++++ b/testsuite/ltrace.minor/attach-process.exp
+@@ -21,6 +21,7 @@ set bin [ltraceCompile {} [ltraceSource c {
+ int main(void) {
+ sleep(5);
+ sleep(1);
++ return 0;
+ }
+ }]]
+
+diff --git a/testsuite/ltrace.minor/libdl-simple.c b/testsuite/ltrace.minor/libdl-simple.c
+index 0bef5cf..b1be002 100644
+--- a/testsuite/ltrace.minor/libdl-simple.c
++++ b/testsuite/ltrace.minor/libdl-simple.c
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
++#include <string.h>
+
+ int main(int argc, char **argv) {
+ void *handle;
+@@ -21,4 +22,5 @@ int main(int argc, char **argv) {
+
+ printf("%d\n", test(5));
+ dlclose(handle);
++ return 0;
+ }
+diff --git a/testsuite/ltrace.minor/time-record.c b/testsuite/ltrace.minor/time-record.c
+index a66b838..7d5e5e3 100644
+--- a/testsuite/ltrace.minor/time-record.c
++++ b/testsuite/ltrace.minor/time-record.c
+@@ -5,6 +5,7 @@
+ This file was written by Yao Qi <qiyao at cn.ibm.com>. */
+ #include <stdio.h>
+ #include <time.h>
++#include <unistd.h>
+
+ #define SLEEP_COUNT 2
+ #define NANOSLEEP_COUNT 50
+diff --git a/testsuite/ltrace.minor/trace-clone.c b/testsuite/ltrace.minor/trace-clone.c
+index ded930c..6aab235 100644
+--- a/testsuite/ltrace.minor/trace-clone.c
++++ b/testsuite/ltrace.minor/trace-clone.c
+@@ -3,7 +3,9 @@
+ clone called.
+
+ This file was written by Yao Qi <qiyao at cn.ibm.com>. */
++#ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
++#endif
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <stdlib.h>
+diff --git a/testsuite/ltrace.minor/trace-fork.c b/testsuite/ltrace.minor/trace-fork.c
+index c5f0c71..9611184 100644
+--- a/testsuite/ltrace.minor/trace-fork.c
++++ b/testsuite/ltrace.minor/trace-fork.c
+@@ -6,6 +6,8 @@
+
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <unistd.h>
++#include <sys/wait.h>
+
+ void
+ child ()
+@@ -27,7 +29,7 @@ main ()
+ else
+ {
+ printf("My child pid is %d\n",pid);
+- wait();
++ wait(NULL);
+ }
+ return 0;
+ }
+diff --git a/testsuite/ltrace.torture/vfork-thread.c b/testsuite/ltrace.torture/vfork-thread.c
+index f909bd3..4c118a6 100644
+--- a/testsuite/ltrace.torture/vfork-thread.c
++++ b/testsuite/ltrace.torture/vfork-thread.c
+@@ -13,6 +13,7 @@ routine (void *data)
+ puts ("bleble");
+ sleep (1);
+ }
++ return NULL;
+ }
+
+
+--
+2.1.0
+
diff --git a/ltrace.spec b/ltrace.spec
index 6fcd6eb..0846c0b 100644
--- a/ltrace.spec
+++ b/ltrace.spec
@@ -1,7 +1,7 @@
Summary: Tracks runtime library calls from dynamically linked executables
Name: ltrace
Version: 0.7.91
-Release: 14%{?dist}
+Release: 15%{?dist}
URL: http://ltrace.alioth.debian.org/
License: GPLv2+
Group: Development/Debuggers
@@ -85,6 +85,12 @@ Patch19: ltrace-0.7.91-unwind-elfutils.patch
Patch20: ltrace-0.7.91-multithread-no-f-1.patch
Patch21: ltrace-0.7.91-multithread-no-f-2.patch
+# Fix problems with building a number of test cases.
+# http://anonscm.debian.org/cgit/collab-maint/ltrace.git/commit/?id=694d19ff14017926454771cbb63a22355b72f1bf
+# http://anonscm.debian.org/cgit/collab-maint/ltrace.git/commit/?id=a3a03622fb4ca9772dca13eae724a94ba1e728f4
+Patch22: ltrace-0.7.91-testsuite-includes.patch
+Patch23: ltrace-0.7.91-testsuite-includes-2.patch
+
%description
Ltrace is a debugging program which runs a specified command until the
command exits. While the command is executing, ltrace intercepts and
@@ -118,6 +124,8 @@ execution of processes.
%patch19 -p1
%patch20 -p1
%patch21 -p1
+%patch22 -p1
+%patch23 -p1
%build
autoreconf -i
@@ -143,6 +151,11 @@ echo ====================TESTING END=====================
%{_datadir}/ltrace
%changelog
+* Wed Apr 8 2015 Petr Machata <pmachata at redhat.com> - 0.7.91-15
+- Add upstream fixes for compilation of test cases
+ (ltrace-0.7.91-testsuite-includes.patch,
+ ltrace-0.7.91-testsuite-includes-2.patch)
+
* Wed Apr 8 2015 Petr Machata <pmachata at redhat.com> - 0.7.91-14
- Add upstream fixes for tracing multi-threaded processes without -f
(ltrace-0.7.91-multithread-no-f-1.patch,
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/ltrace.git/commit/?h=master&id=091cc6df51bec89c67e90b878411fb401da3586e
More information about the scm-commits
mailing list