Merge authors:
Steve Langasek (vorlon)
Related merge proposals:
https://code.launchpad.net/~vorlon/upstart/fix-environ-order-assumption/+merge/136045
proposed by: Steve Langasek (vorlon)
review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1391 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Mon 2012-11-26 14:04:27 +0000
message:
* Merge of lp:~vorlon/upstart/fix-environ-order-assumption.
* init/tests/test_job_process.c: child(): Removed unused variables
'buffer' and 'in' causing tests to fail when compiled with full
warnings.
modified:
init/tests/test_job_process.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c 2012-11-18 18:21:54 +0000
+++ init/tests/test_job_process.c 2012-11-26 14:04:27 +0000
@@ -163,15 +163,19 @@
return 1;
}
+static int
+strcmp_compar (const void *a, const void *b)
+{
+ return strcmp(*(char * const *)a, *(char * const *)b);
+}
+
static void
child (enum child_tests test,
const char *filename)
{
FILE *out;
- FILE *in;
char tmpname[PATH_MAX], path[PATH_MAX];
int i;
- char buffer[1024];
int ret = EXIT_SUCCESS;
strcpy (tmpname, filename);
@@ -203,6 +207,10 @@
fprintf (out, "wd: %s\n", path);
break;
case TEST_ENVIRONMENT:
+ /* guarantee output ordering */
+ for (i = 0; environ[i]; i++);
+ qsort (environ, i, sizeof (environ[0]), strcmp_compar);
+
for (char **env = environ; *env; env++)
fprintf (out, "%s\n", *env);
break;
@@ -669,10 +677,10 @@
* the job.
*/
output = fopen (filename, "r");
+ TEST_FILE_EQ (output, "BAR=BAZ\n");
TEST_FILE_EQ (output, "FOO=BAR\n");
- TEST_FILE_EQ (output, "BAR=BAZ\n");
+ TEST_FILE_EQ (output, "UPSTART_INSTANCE=\n");
TEST_FILE_EQ (output, "UPSTART_JOB=test\n");
- TEST_FILE_EQ (output, "UPSTART_INSTANCE=\n");
TEST_FILE_EQ (output, "UPSTART_NO_SESSIONS=1\n");
TEST_FILE_END (output);
fclose (output);
@@ -722,10 +730,10 @@
* the job.
*/
output = fopen (filename, "r");
+ TEST_FILE_EQ (output, "BAR=BAZ\n");
TEST_FILE_EQ (output, "FOO=BAR\n");
- TEST_FILE_EQ (output, "BAR=BAZ\n");
- TEST_FILE_EQ (output, "UPSTART_JOB=test\n");
TEST_FILE_EQ (output, "UPSTART_INSTANCE=foo\n");
+ TEST_FILE_EQ (output, "UPSTART_JOB=test\n");
TEST_FILE_EQ (output, "UPSTART_NO_SESSIONS=1\n");
TEST_FILE_END (output);
fclose (output);
@@ -776,11 +784,11 @@
* the job.
*/
output = fopen (filename, "r");
- TEST_FILE_EQ (output, "FOO=SMACK\n");
TEST_FILE_EQ (output, "BAR=BAZ\n");
TEST_FILE_EQ (output, "CRACKLE=FIZZ\n");
+ TEST_FILE_EQ (output, "FOO=SMACK\n");
+ TEST_FILE_EQ (output, "UPSTART_INSTANCE=\n");
TEST_FILE_EQ (output, "UPSTART_JOB=test\n");
- TEST_FILE_EQ (output, "UPSTART_INSTANCE=\n");
TEST_FILE_EQ (output, "UPSTART_NO_SESSIONS=1\n");
TEST_FILE_END (output);
fclose (output);
@@ -831,11 +839,11 @@
* the job.
*/
output = fopen (filename, "r");
- TEST_FILE_EQ (output, "FOO=SMACK\n");
TEST_FILE_EQ (output, "BAR=BAZ\n");
TEST_FILE_EQ (output, "CRACKLE=FIZZ\n");
+ TEST_FILE_EQ (output, "FOO=SMACK\n");
+ TEST_FILE_EQ (output, "UPSTART_INSTANCE=\n");
TEST_FILE_EQ (output, "UPSTART_JOB=test\n");
- TEST_FILE_EQ (output, "UPSTART_INSTANCE=\n");
TEST_FILE_EQ (output, "UPSTART_NO_SESSIONS=1\n");
TEST_FILE_END (output);
fclose (output);
@@ -4337,8 +4345,8 @@
waitpid (pid, NULL, 0);
output = fopen (filename, "r");
+ TEST_FILE_EQ (output, "FOO=bar\n");
TEST_FILE_EQ (output, "PATH=/bin\n");
- TEST_FILE_EQ (output, "FOO=bar\n");
TEST_FILE_EQ (output, "UPSTART_NO_SESSIONS=1\n");
TEST_FILE_END (output);
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
