Simplify tests even more

Drop the useless `export` lines from `env` files.
akheron · Mar 25, 2024 · dcbeb58 · dcbeb58
1 parent 53383b9
commit dcbeb58
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 18 deletions.
diff --git a/CHANGES b/CHANGES
@@ -12,6 +12,7 @@ Work in progress
 * Build:
 
   - Make test output nicer in CMake based builds (#683)
+  - Simplify tests (#685)
 
 Version 2.14
 ============

diff --git a/test/bin/json_process.c b/test/bin/json_process.c
@@ -80,11 +80,10 @@ static char *loadfile(FILE *file) {
 
 static void read_conf(FILE *conffile) {
     char *buffer, *line, *val;
+    conf.have_hashseed = 0;
 
     buffer = loadfile(conffile);
     for (line = strtok(buffer, "\r\n"); line; line = strtok(NULL, "\r\n")) {
-        if (!strncmp(line, "export ", 7))
-            continue;
         val = strchr(line, '=');
         if (!val) {
             printf("invalid configuration line\n");
@@ -109,8 +108,6 @@ static void read_conf(FILE *conffile) {
         if (!strcmp(line, "HASHSEED")) {
             conf.have_hashseed = 1;
             conf.hashseed = atoi(val);
-        } else {
-            conf.have_hashseed = 0;
         }
     }
 

diff --git a/test/suites/encoding-flags/compact-array/env b/test/suites/encoding-flags/compact-array/env
@@ -1,2 +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
@@ -1,3 +1,2 @@
 JSON_COMPACT=1
 HASHSEED=1
-export JSON_COMPACT HASHSEED
diff --git a/test/suites/encoding-flags/ensure-ascii/env b/test/suites/encoding-flags/ensure-ascii/env
@@ -1,2 +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
@@ -1,2 +1 @@
 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
@@ -1,3 +1,2 @@
 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
@@ -1,4 +1,3 @@
 JSON_INDENT=4
 JSON_COMPACT=1
 HASHSEED=1
-export JSON_INDENT JSON_COMPACT HASHSEED
diff --git a/test/suites/encoding-flags/indent-object/env b/test/suites/encoding-flags/indent-object/env
@@ -1,3 +1,2 @@
 JSON_INDENT=4
 HASHSEED=1
-export JSON_INDENT HASHSEED
diff --git a/test/suites/encoding-flags/object/env b/test/suites/encoding-flags/object/env
@@ -1,2 +1 @@
 HASHSEED=1
-export HASHSEED
diff --git a/test/suites/encoding-flags/preserve-order/env b/test/suites/encoding-flags/preserve-order/env
@@ -1,2 +1 @@
 JSON_PRESERVE_ORDER=1
-export JSON_PRESERVE_ORDER
diff --git a/test/suites/encoding-flags/real-precision/env b/test/suites/encoding-flags/real-precision/env
@@ -1,2 +1 @@
 JSON_REAL_PRECISION=4
-export JSON_REAL_PRECISION
diff --git a/test/suites/encoding-flags/sort-keys/env b/test/suites/encoding-flags/sort-keys/env
@@ -1,2 +1 @@
 JSON_SORT_KEYS=1
-export JSON_SORT_KEYS
diff --git a/test/suites/valid/run b/test/suites/valid/run
@@ -5,9 +5,6 @@
 # Jansson is free software; you can redistribute it and/or modify
 # it under the terms of the MIT license. See LICENSE for details.
 
-JSON_SORT_KEYS=1
-export JSON_SORT_KEYS
-
 is_test() {
     test -d $test_path
 }
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		JSON_PRESERVE_ORDER=1
		export JSON_PRESERVE_ORDER
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		JSON_REAL_PRECISION=4
		export JSON_REAL_PRECISION