Package: upstart
Version: 1.11
Severity: wishlist
Tags: patch
Dear Maintainer,
in source file util/tests/test_initctl.c definition of hup_handler function
should be moved outside function test_start_action beacause during compilation
clang inject it.
-- System Information:
Debian Release: jessie/sid
APT prefers testing-updates
APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 3.12-1-686-pae (SMP w/3 CPU cores)
diff -Nupr upstart-1.11/util/tests/test_initctl.c upstart-1.11-clang/util/tests/test_initctl.c
--- upstart-1.11/util/tests/test_initctl.c 2013-11-14 12:55:31.000000000 +0100
+++ upstart-1.11-clang/util/tests/test_initctl.c 2014-02-04 16:45:15.251304000 +0100
@@ -3320,6 +3320,11 @@ test_job_status (void)
dbus_shutdown ();
}
+void
+hup_handler (int signum)
+{
+ _exit (0);
+}
void
test_start_action (void)
@@ -3461,7 +3466,7 @@ test_start_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
+
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -3791,7 +3796,6 @@ test_start_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -4123,7 +4127,6 @@ test_start_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -4483,7 +4486,6 @@ test_start_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -5262,7 +5264,6 @@ test_stop_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -5508,7 +5509,6 @@ test_stop_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -5754,7 +5754,6 @@ test_stop_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -5999,7 +5998,6 @@ test_stop_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -6818,7 +6816,6 @@ test_restart_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -7148,7 +7145,6 @@ test_restart_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -7480,7 +7476,6 @@ test_restart_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -7840,7 +7835,6 @@ test_restart_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
diff -Nupr upstart-1.11/util/tests/test_initctl.c upstart-1.11-clang/util/tests/test_initctl.c
--- upstart-1.11/util/tests/test_initctl.c 2013-11-14 12:55:31.000000000 +0100
+++ upstart-1.11-clang/util/tests/test_initctl.c 2014-02-04 16:45:15.251304000 +0100
@@ -3320,6 +3320,11 @@ test_job_status (void)
dbus_shutdown ();
}
+void
+hup_handler (int signum)
+{
+ _exit (0);
+}
void
test_start_action (void)
@@ -3461,7 +3466,7 @@ test_start_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
+
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -3791,7 +3796,6 @@ test_start_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -4123,7 +4127,6 @@ test_start_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -4483,7 +4486,6 @@ test_start_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -5262,7 +5264,6 @@ test_stop_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -5508,7 +5509,6 @@ test_stop_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -5754,7 +5754,6 @@ test_stop_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -5999,7 +5998,6 @@ test_stop_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -6818,7 +6816,6 @@ test_restart_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -7148,7 +7145,6 @@ test_restart_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -7480,7 +7476,6 @@ test_restart_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
@@ -7840,7 +7835,6 @@ test_restart_action (void)
* of memory cases.
*/
for (;;) {
- void hup_handler (int signum) { _exit (0); }
signal (SIGHUP, hup_handler);
/* Expect the Get call for the job name, reply with
