projects
/
jansson.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
54d8875
)
Fix tests on shells that don't support the export FOO=bar syntax
author
Petri Lehtinen
<petri@digip.org>
Thu, 8 Mar 2012 13:01:52 +0000
(15:01 +0200)
committer
Petri Lehtinen
<petri@digip.org>
Thu, 8 Mar 2012 13:01:52 +0000
(15:01 +0200)
test/run-suites
patch
|
blob
|
history
test/suites/encoding-flags/compact-array/env
patch
|
blob
|
history
test/suites/encoding-flags/compact-object/env
patch
|
blob
|
history
test/suites/encoding-flags/ensure-ascii/env
patch
|
blob
|
history
test/suites/encoding-flags/indent-array/env
patch
|
blob
|
history
test/suites/encoding-flags/indent-compact-array/env
patch
|
blob
|
history
test/suites/encoding-flags/indent-compact-object/env
patch
|
blob
|
history
test/suites/encoding-flags/indent-object/env
patch
|
blob
|
history
test/suites/encoding-flags/preserve-order/env
patch
|
blob
|
history
test/suites/encoding-flags/sort-keys/env
patch
|
blob
|
history
test/suites/valid/run
patch
|
blob
|
history
diff --git
a/test/run-suites
b/test/run-suites
index
ea35424
..
4cbaa8b
100755
(executable)
--- a/
test/run-suites
+++ b/
test/run-suites
@@
-22,11
+22,12
@@
fi
[ -z "$STOP" ] && STOP=0
[ -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
passed=0
failed=0
diff --git
a/test/suites/encoding-flags/compact-array/env
b/test/suites/encoding-flags/compact-array/env
index
9eab19d
..
4474aaf
100644
(file)
--- 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
diff --git
a/test/suites/encoding-flags/compact-object/env
b/test/suites/encoding-flags/compact-object/env
index
9eab19d
..
4474aaf
100644
(file)
--- 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
diff --git
a/test/suites/encoding-flags/ensure-ascii/env
b/test/suites/encoding-flags/ensure-ascii/env
index
6a0e0aa
..
1b7b3e3
100644
(file)
--- 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
diff --git
a/test/suites/encoding-flags/indent-array/env
b/test/suites/encoding-flags/indent-array/env
index
273232a
..
d220f83
100644
(file)
--- 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
diff --git
a/test/suites/encoding-flags/indent-compact-array/env
b/test/suites/encoding-flags/indent-compact-array/env
index
89c9f78
..
78fbfcc
100644
(file)
--- 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
diff --git
a/test/suites/encoding-flags/indent-compact-object/env
b/test/suites/encoding-flags/indent-compact-object/env
index
89c9f78
..
78fbfcc
100644
(file)
--- 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
diff --git
a/test/suites/encoding-flags/indent-object/env
b/test/suites/encoding-flags/indent-object/env
index
273232a
..
d220f83
100644
(file)
--- 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
diff --git
a/test/suites/encoding-flags/preserve-order/env
b/test/suites/encoding-flags/preserve-order/env
index
ce3582d
..
4d9d206
100644
(file)
--- 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
diff --git
a/test/suites/encoding-flags/sort-keys/env
b/test/suites/encoding-flags/sort-keys/env
index
00529e7
..
3ef24cb
100644
(file)
--- 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
diff --git
a/test/suites/valid/run
b/test/suites/valid/run
index
fa594e6
..
4f14d61
100755
(executable)
--- 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.
# 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
is_test() {
test -d $test_path