Commit 62004db6 authored by nextime's avatar nextime

better format the patch

parent 3763fa5a
diff --git a/src/tests/test.c b/src/tests/test.c
index f828ffa..f1845eb 100644
--- a/src/tests/test.c
+++ b/src/tests/test.c
@@ -299,7 +299,7 @@ test_spawned_job_abnormal_termination (void)
UDisksSpawnedJob *job;
gchar *s;
- s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 4");
+ s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 4 2> /dev/null");
job = udisks_spawned_job_new (s, NULL, getuid (), geteuid (), NULL, NULL);
_g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
(gpointer) "Command-line `./udisks-test-helper 4' was signaled with signal SIGSEGV (11): "
@@ -307,7 +307,7 @@ test_spawned_job_abnormal_termination (void)
g_object_unref (job);
g_free (s);
- s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 5");
+ s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 5 2> /dev/null");
job = udisks_spawned_job_new (s, NULL, getuid (), geteuid (), NULL, NULL);
_g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
(gpointer) "Command-line `./udisks-test-helper 5' was signaled with signal SIGABRT (6): "
diff --git a/debian/patches/qemu-fixtests.patch b/debian/patches/qemu-fixtests.patch
index 04a8bb5..e69de29 100644
--- a/debian/patches/qemu-fixtests.patch
+++ b/debian/patches/qemu-fixtests.patch
@@ -1,60 +0,0 @@
-diff --git a/src/tests/test.c b/src/tests/test.c
-index f828ffa..f1845eb 100644
---- a/src/tests/test.c
-+++ b/src/tests/test.c
-@@ -299,7 +299,7 @@ test_spawned_job_abnormal_termination (void)
- UDisksSpawnedJob *job;
- gchar *s;
-
-- s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 4");
-+ s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 4 2> /dev/null");
- job = udisks_spawned_job_new (s, NULL, getuid (), geteuid (), NULL, NULL);
- _g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
- (gpointer) "Command-line `./udisks-test-helper 4' was signaled with signal SIGSEGV (11): "
-@@ -307,7 +307,7 @@ test_spawned_job_abnormal_termination (void)
- g_object_unref (job);
- g_free (s);
-
-- s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 5");
-+ s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 5 2> /dev/null");
- job = udisks_spawned_job_new (s, NULL, getuid (), geteuid (), NULL, NULL);
- _g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
- (gpointer) "Command-line `./udisks-test-helper 5' was signaled with signal SIGABRT (6): "
-
-diff --git a/src/tests/helper.c b/src/tests/helper.c
-index 388494d..3b6445d 100644
---- a/src/tests/helper.c
-+++ b/src/tests/helper.c
-@@ -36,7 +36,7 @@ main (int argc, char *argv[])
-
- ret = 1;
-
-- g_assert_cmpint (argc, ==, 2);
-+ g_assert_cmpint (argc, >=, 2);
- switch (strtol (argv[1], NULL, 10))
- {
- case 0:
-
-t a/src/tests/test.c b/src/tests/test.c
-index f828ffa..c57776f 100644
---- a/src/tests/test.c
-+++ b/src/tests/test.c
-@@ -302,7 +302,7 @@ test_spawned_job_abnormal_termination (void)
- s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 4");
- job = udisks_spawned_job_new (s, NULL, getuid (), geteuid (), NULL, NULL);
- _g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
-- (gpointer) "Command-line `./udisks-test-helper 4' was signaled with signal SIGSEGV (11): "
-+ (gpointer) "Command-line `./udisks-test-helper 4 2> /dev/null' was signaled with signal SIGSEGV (11): "
- "OK, deliberately causing a segfault\n");
- g_object_unref (job);
- g_free (s);
-@@ -310,7 +310,7 @@ test_spawned_job_abnormal_termination (void)
- s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 5");
- job = udisks_spawned_job_new (s, NULL, getuid (), geteuid (), NULL, NULL);
- _g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
-- (gpointer) "Command-line `./udisks-test-helper 5' was signaled with signal SIGABRT (6): "
-+ (gpointer) "Command-line `./udisks-test-helper 5 2> /dev/null' was signaled with signal SIGABRT (6): "
- "OK, deliberately abort()'ing\n");
- g_object_unref (job);
- g_free (s);
-
diff --git a/src/tests/helper.c b/src/tests/helper.c
index 388494d..3b6445d 100644
--- a/src/tests/helper.c
......@@ -34,13 +76,16 @@ index 388494d..3b6445d 100644
switch (strtol (argv[1], NULL, 10))
{
case 0:
t a/src/tests/test.c b/src/tests/test.c
index f828ffa..c57776f 100644
diff --git a/src/tests/test.c b/src/tests/test.c
index f828ffa..d502b0b 100644
--- a/src/tests/test.c
+++ b/src/tests/test.c
@@ -302,7 +302,7 @@ test_spawned_job_abnormal_termination (void)
s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 4");
@@ -299,18 +299,18 @@ test_spawned_job_abnormal_termination (void)
UDisksSpawnedJob *job;
gchar *s;
- s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 4");
+ s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 4 2> /dev/null");
job = udisks_spawned_job_new (s, NULL, getuid (), geteuid (), NULL, NULL);
_g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
- (gpointer) "Command-line `./udisks-test-helper 4' was signaled with signal SIGSEGV (11): "
......@@ -48,8 +93,9 @@ index f828ffa..c57776f 100644
"OK, deliberately causing a segfault\n");
g_object_unref (job);
g_free (s);
@@ -310,7 +310,7 @@ test_spawned_job_abnormal_termination (void)
s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 5");
- s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 5");
+ s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 5 2> /dev/null");
job = udisks_spawned_job_new (s, NULL, getuid (), geteuid (), NULL, NULL);
_g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
- (gpointer) "Command-line `./udisks-test-helper 5' was signaled with signal SIGABRT (6): "
......@@ -57,4 +103,3 @@ index f828ffa..c57776f 100644
"OK, deliberately abort()'ing\n");
g_object_unref (job);
g_free (s);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment