Merge branch '2.3'

2025-04-06 14:05:03 +00:00 · 2012-03-08 15:03:03 +02:00 · 2012-03-08 15:03:03 +02:00 · 1eb274c555
commit 1eb274c555
parent f736e705b2 6ac6f311b5
11 changed files with 28 additions and 17 deletions
--- a/test/run-suites
+++ b/test/run-suites
@ -22,11 +22,12 @@ fi

 [ -z "$STOP" ] && STOP=0

-export suites_srcdir=$top_srcdir/test/suites
-export suites_builddir=suites
-export scriptdir=$top_srcdir/test/scripts
-export logdir=logs
-export bindir=bin
+suites_srcdir=$top_srcdir/test/suites
+suites_builddir=suites
+scriptdir=$top_srcdir/test/scripts
+logdir=logs
+bindir=bin
+export suites_srcdir suites_builddir scriptdir logdir bindir

 passed=0
 failed=0
--- a/test/suites/encoding-flags/compact-array/env
+++ b/test/suites/encoding-flags/compact-array/env
@ -1 +1,2 @@
-export JSON_COMPACT=1
+JSON_COMPACT=1
+export JSON_COMPACT
--- a/test/suites/encoding-flags/compact-object/env
+++ b/test/suites/encoding-flags/compact-object/env
@ -1 +1,2 @@
-export JSON_COMPACT=1
+JSON_COMPACT=1
+export JSON_COMPACT
--- a/test/suites/encoding-flags/ensure-ascii/env
+++ b/test/suites/encoding-flags/ensure-ascii/env
@ -1 +1,2 @@
-export JSON_ENSURE_ASCII=1
+JSON_ENSURE_ASCII=1
+export JSON_ENSURE_ASCII
--- a/test/suites/encoding-flags/indent-array/env
+++ b/test/suites/encoding-flags/indent-array/env
@ -1 +1,2 @@
-export JSON_INDENT=4
+JSON_INDENT=4
+export JSON_INDENT
--- a/test/suites/encoding-flags/indent-compact-array/env
+++ b/test/suites/encoding-flags/indent-compact-array/env
@ -1,2 +1,3 @@
-export JSON_INDENT=4
-export JSON_COMPACT=1
+JSON_INDENT=4
+JSON_COMPACT=1
+export JSON_INDENT JSON_COMPACT
--- a/test/suites/encoding-flags/indent-compact-object/env
+++ b/test/suites/encoding-flags/indent-compact-object/env
@ -1,2 +1,3 @@
-export JSON_INDENT=4
-export JSON_COMPACT=1
+JSON_INDENT=4
+JSON_COMPACT=1
+export JSON_INDENT JSON_COMPACT
--- a/test/suites/encoding-flags/indent-object/env
+++ b/test/suites/encoding-flags/indent-object/env
@ -1 +1,2 @@
-export JSON_INDENT=4
+JSON_INDENT=4
+export JSON_INDENT
--- a/test/suites/encoding-flags/preserve-order/env
+++ b/test/suites/encoding-flags/preserve-order/env
@ -1 +1,2 @@
-export JSON_PRESERVE_ORDER=1
+JSON_PRESERVE_ORDER=1
+export JSON_PRESERVE_ORDER
--- a/test/suites/encoding-flags/sort-keys/env
+++ b/test/suites/encoding-flags/sort-keys/env
@ -1 +1,2 @@
-export JSON_SORT_KEYS=1
+JSON_SORT_KEYS=1
+export JSON_SORT_KEYS
--- a/test/suites/valid/run
+++ b/test/suites/valid/run
@ -5,7 +5,8 @@
 # Jansson is free software; you can redistribute it and/or modify
 # it under the terms of the MIT license. See LICENSE for details.

-export JSON_SORT_KEYS=1
+JSON_SORT_KEYS=1
+export JSON_SORT_KEYS

 is_test() {
    test -d $test_path