← Back to branch summary

~jamesodhunt/ubuntu/vivid/upstart/bug-1447756

« back to all changes in this revision

Viewing changes to init/tests/test_conf.c

  • Committer: James Hunt
  • Date: 2011-12-14 14:09:46 UTC
  • mfrom: (1185.1.14 upstream)
  • Revision ID: james.hunt@ubuntu.com-20111214140946-omh0ikuf6utjdm1o
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/tests/test_conf.c
85
85
        FD_ZERO (&writefds);                                         \
86
86
        FD_ZERO (&exceptfds);                                        \
87
87
                                                                     \
88
 
        nih_debug("calling nih_io_select_fds");                      \
89
88
        nih_io_select_fds (&nfds, &readfds, &writefds, &exceptfds);  \
90
 
        nih_debug("calling nih_io_handle_fds");                      \
91
89
        nih_io_handle_fds (&readfds, &writefds, &exceptfds);         \
92
90
}
93
91
 
3194
3192
        fprintf (f, "author \"foo\"\n");
3195
3193
        fclose (f);
3196
3194
 
3197
 
        /* FIXME: crashes here */
3198
3195
        TEST_FORCE_WATCH_UPDATE();
3199
3196
 
3200
3197
        /* ensure conf loaded */
4593
4590
        TEST_FUNCTION ("conf_file_destroy");
4594
4591
        source = conf_source_new (NULL, "/path", CONF_JOB_DIR);
4595
4592
 
 
4593
 
4596
4594
        /* Check that when a ConfFile for a job is freed, the attached
4597
4595
         * job is also freed if it is not the current job.
4598
4596
         */
4671
4669
test_select_job (void)
4672
4670
{
4673
4671
        ConfSource *source1, *source2, *source3;
4674
 
        ConfFile   *file1, *file2, *file3, *file4, *file5;
4675
 
        JobClass   *class1, *class2, *class3, *class4, *ptr;
 
4672
        ConfFile   *file1, *file3, *file4, *file5;
 
4673
        JobClass   *class1, *class2, *class4, *ptr;
 
4674
 
 
4675
        /* keep gcc 4.6 happy */
 
4676
        ConfFile   *file2  __attribute__((__unused__));
 
4677
        JobClass   *class3 __attribute__((__unused__));
4676
4678
 
4677
4679
        TEST_FUNCTION ("conf_select_job");
4678
4680
        source1 = conf_source_new (NULL, "/tmp/foo", CONF_DIR);