Ubuntu
libnih package

Merge lp:~jamesodhunt/ubuntu/trusty/libnih/fix-test-output-crash into lp:ubuntu/trusty/libnih

  1. Trusty (14.04)
  2. fix-test-output-crash
  3. Merge into trusty
Proposed by James Hunt
Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: not available
Proposed branch: lp:~jamesodhunt/ubuntu/trusty/libnih/fix-test-output-crash
Merge into: lp:ubuntu/trusty/libnih
Diff against target: 25 lines (+6/-1)
2 files modified
ChangeLog (+5/-0)
nih/test_output.h (+1/-1)
To merge this branch: bzr merge lp:~jamesodhunt/ubuntu/trusty/libnih/fix-test-output-crash
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Pending
Review via email: mp+217199@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-03-14 10:27:34 +0000
3+++ ChangeLog 2014-04-25 10:42:11 +0000
4@@ -1,3 +1,8 @@
5+2014-04-25 James Hunt <james.hunt@ubuntu.com>
6+
7+ * nih/test_output.h: print_last(): Check variable to avoid
8+ passing NULL to atoi(3).
9+
10 2013-03-13 Steve Langasek <steve.langasek@ubuntu.com>
11
12 * nih/watch.c (nih_watch_walk_filter): New NihFileFilter function
13
14=== modified file 'nih/test_output.h'
15--- nih/test_output.h 2013-11-11 15:35:21 +0000
16+++ nih/test_output.h 2014-04-25 10:42:11 +0000
17@@ -108,7 +108,7 @@
18 void
19 print_last ( void )
20 {
21- if ( atoi (getenv ("TEST_EXIT_LOCK")) == getpid ()) {
22+ if (getenv ("TEST_EXIT_LOCK") && atoi (getenv ("TEST_EXIT_LOCK")) == getpid ()) {
23 TEST_PRINT_RESULT ("ok");
24 TEST_PLAN_END();
25 }

Subscribers

People subscribed via source and target branches

to all changes: