Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/40aa44e4f50dd35cbc113...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/40aa44e4f50dd35cbc11332...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/40aa44e4f50dd35cbc11332b1...
The branch, master has been updated
via 40aa44e4f50dd35cbc11332b1c1865b3152afb2d (commit)
from 737a09d53e57b6ca7bba82e4e579056127fec17f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=40aa44e4f50dd35cbc1...
commit 40aa44e4f50dd35cbc11332b1c1865b3152afb2d
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
make options test use build directory for temporary files rather than /tmp
diff --git a/test/Makefile b/test/Makefile
index e92ece7..81482f6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -143,6 +143,7 @@ BASE_TESTCFLAGS := -std=c99 -g \
-Dnsgtk \
-DNETSURF_BUILTIN_LOG_FILTER=\"level:WARNING\" \
-DNETSURF_BUILTIN_VERBOSE_FILTER=\"level:DEBUG\" \
+ -DTESTROOT=\"$(TESTROOT)\" \
$(SAN_FLAGS) \
$(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils
libutf8proc) \
$(LIB_CFLAGS)
diff --git a/test/nsoption.c b/test/nsoption.c
index fe98679..0159148 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";
@@ -51,7 +55,7 @@ static char *testnam(char *out)
static char name[64];
int pid;
pid=getpid();
- snprintf(name, 64, "/tmp/nsoptiontest%d%d", pid, count);
+ snprintf(name, 64, TESTROOT"/nsoptiontest%d%d", pid, count);
count++;
return name;
}
-----------------------------------------------------------------------
Summary of changes:
test/Makefile | 1 +
test/nsoption.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/Makefile b/test/Makefile
index e92ece7..81482f6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -143,6 +143,7 @@ BASE_TESTCFLAGS := -std=c99 -g \
-Dnsgtk \
-DNETSURF_BUILTIN_LOG_FILTER=\"level:WARNING\" \
-DNETSURF_BUILTIN_VERBOSE_FILTER=\"level:DEBUG\" \
+ -DTESTROOT=\"$(TESTROOT)\" \
$(SAN_FLAGS) \
$(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils
libutf8proc) \
$(LIB_CFLAGS)
diff --git a/test/nsoption.c b/test/nsoption.c
index fe98679..0159148 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";
@@ -51,7 +55,7 @@ static char *testnam(char *out)
static char name[64];
int pid;
pid=getpid();
- snprintf(name, 64, "/tmp/nsoptiontest%d%d", pid, count);
+ snprintf(name, 64, TESTROOT"/nsoptiontest%d%d", pid, count);
count++;
return name;
}
--
NetSurf Browser