~vorlon/ubuntu/raring/upstart/lp.1199778

Attempt to cherry-pick fixes for bug #1199778 to raring; something is still
missing though, the test suite segfaults on one of the json loads.

added added

removed removed

#include "blocked.h"

#include "conf.h"

#include "errors.h"

#include "test_util.h"

#include "test_util_common.h"

#define EXPECTED_JOB_LOGDIR "/var/log/upstart"

#define TEST_SHELL "/bin/sh"

174

return 1;

175

}

176

177

static int

178

strcmp_compar (const void *a, const void *b)

179

{

180

return strcmp(*(char * const *)a, *(char * const *)b);

181

}

182

183

177

static void

184

178

child (enum child_tests test,

185

179

const char *filename)