organicmaps/jansson
13
Fork 0
mirror of https://github.com/akheron/jansson.git synced 2025-04-04 13:05:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Simplify tests even more

Browse source 
Drop the useless `export` lines from `env` files.
This commit is contained in:
Petri Lehtinen 2024-03-25 19:01:14 +02:00
parent 53383b9e26
commit dcbeb58829
14 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES
View file

@ -12,6 +12,7 @@ Work in progress
* Build:
- Make test output nicer in CMake based builds (#683)
- Simplify tests (#685)
Version 2.14
============

5
test/bin/json_process.c
View file

@ -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;
}
}

1
test/suites/encoding-flags/compact-array/env
View file

@ -1,2 +1 @@
JSON_COMPACT=1
export JSON_COMPACT

1
test/suites/encoding-flags/compact-object/env
View file

@ -1,3 +1,2 @@
JSON_COMPACT=1
HASHSEED=1
export JSON_COMPACT HASHSEED

1
test/suites/encoding-flags/ensure-ascii/env
View file

@ -1,2 +1 @@
JSON_ENSURE_ASCII=1
export JSON_ENSURE_ASCII

1
test/suites/encoding-flags/indent-array/env
View file

@ -1,2 +1 @@
JSON_INDENT=4
export JSON_INDENT

1
test/suites/encoding-flags/indent-compact-array/env
View file

@ -1,3 +1,2 @@
JSON_INDENT=4
JSON_COMPACT=1
export JSON_INDENT JSON_COMPACT

1
test/suites/encoding-flags/indent-compact-object/env
View file

@ -1,4 +1,3 @@
JSON_INDENT=4
JSON_COMPACT=1
HASHSEED=1
export JSON_INDENT JSON_COMPACT HASHSEED

1
test/suites/encoding-flags/indent-object/env
View file

@ -1,3 +1,2 @@
JSON_INDENT=4
HASHSEED=1
export JSON_INDENT HASHSEED

1
test/suites/encoding-flags/object/env
View file

@ -1,2 +1 @@
HASHSEED=1
export HASHSEED

1
test/suites/encoding-flags/preserve-order/env
View file

@ -1,2 +1 @@
JSON_PRESERVE_ORDER=1
export JSON_PRESERVE_ORDER

1
test/suites/encoding-flags/real-precision/env
View file

@ -1,2 +1 @@
JSON_REAL_PRECISION=4
export JSON_REAL_PRECISION

1
test/suites/encoding-flags/sort-keys/env
View file

@ -1,2 +1 @@
JSON_SORT_KEYS=1
export JSON_SORT_KEYS

3
test/suites/valid/run
View file

@ -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
}