summaryrefslogtreecommitdiff
path: root/test/nsoption.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/nsoption.c')
-rw-r--r--test/nsoption.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/nsoption.c b/test/nsoption.c
index 8f2388a5b..33da1f7e0 100644
--- a/test/nsoption.c
+++ b/test/nsoption.c
@@ -33,6 +33,10 @@
#include "utils/log.h"
#include "utils/nsoption.h"
+#ifndef TESTROOT
+#define TESTROOT "/tmp"
+#endif
+
const char *test_choices_path = "test/data/Choices";
const char *test_choices_short_path = "test/data/Choices-short";
const char *test_choices_all_path = "test/data/Choices-all";
@@ -49,7 +53,9 @@ static char *testnam(char *out)
{
static int count = 0;
static char name[64];
- snprintf(name, 64, "/tmp/nsoptiontest%d", count);
+ int pid;
+ pid=getpid();
+ snprintf(name, 64, TESTROOT"/nsoptiontest%d%d", pid, count);
count++;
return name;
}
@@ -241,7 +247,7 @@ struct format_test_vec_s format_test_vec[] = {
},
{
NSOPTION_sys_colour_ActiveBorder,
- "<tr><th>sys_colour_ActiveBorder</th><td>colour</td><td>default</td><td><span style=\"background-color: #d3d3d3; color: #000000; font-family:Monospace; \">#D3D3D3</span></td></tr>",
+ "<tr><th>sys_colour_ActiveBorder</th><td>colour</td><td>default</td><td><span style=\"font-family:Monospace;\">#D3D3D3</span> <span style=\"background-color: #d3d3d3; border: 1px solid #000000; display: inline-block; width: 1em; height: 1em;\"></span></td></tr>",
"sys_colour_ActiveBorder:d3d3d3"
},
};