netsurf: branch master updated. release/3.9-246-g737a09d

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/737a09d53e57b6ca7bba8... ...commit http://git.netsurf-browser.org/netsurf.git/commit/737a09d53e57b6ca7bba82e... ...tree http://git.netsurf-browser.org/netsurf.git/tree/737a09d53e57b6ca7bba82e4e... The branch, master has been updated via 737a09d53e57b6ca7bba82e4e579056127fec17f (commit) via d5490be98aa754906fb55dce445f1eb581a29edc (commit) from 6c470679ee23f85ff291a1a68319289fbd807696 (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=737a09d53e57b6ca7bb... commit 737a09d53e57b6ca7bba82e4e579056127fec17f Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; make the temporary file names unique so other tests do not overwrite them diff --git a/test/nsoption.c b/test/nsoption.c index 8f2388a..fe98679 100644 --- a/test/nsoption.c +++ b/test/nsoption.c @@ -49,7 +49,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, "/tmp/nsoptiontest%d%d", pid, count); count++; return name; } commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d5490be98aa754906fb... commit d5490be98aa754906fb55dce445f1eb581a29edc Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; fix options test diff --git a/test/data/Choices-all b/test/data/Choices-all index d16c675..f2a6188 100644 --- a/test/data/Choices-all +++ b/test/data/Choices-all @@ -113,4 +113,5 @@ new_blank:0 hotlist_path:/home/vince/.netsurf/Hotlist developer_view:0 position_tab:0 -toolbar_order: +toolbar_items: +bar_show: ----------------------------------------------------------------------- Summary of changes: test/data/Choices-all | 3 ++- test/nsoption.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/data/Choices-all b/test/data/Choices-all index d16c675..f2a6188 100644 --- a/test/data/Choices-all +++ b/test/data/Choices-all @@ -113,4 +113,5 @@ new_blank:0 hotlist_path:/home/vince/.netsurf/Hotlist developer_view:0 position_tab:0 -toolbar_order: +toolbar_items: +bar_show: diff --git a/test/nsoption.c b/test/nsoption.c index 8f2388a..fe98679 100644 --- a/test/nsoption.c +++ b/test/nsoption.c @@ -49,7 +49,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, "/tmp/nsoptiontest%d%d", pid, count); count++; return name; } -- NetSurf Browser