Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from akheron:master #5

Merged
merged 2 commits into from
Mar 27, 2024
Merged

[pull] master from akheron:master #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcbeb58
Simplify tests even more
akheron Mar 25, 2024
8660da0
Merge pull request #685 from akheron/simplify-tests
akheron Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Work in progress
* Build:

- Make test output nicer in CMake based builds (#683)
- Simplify tests (#685)

Version 2.14
============
Expand Down
5 changes: 1 addition & 4 deletions test/bin/json_process.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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;
}
}

Expand Down
1 change: 0 additions & 1 deletion test/suites/encoding-flags/compact-array/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
JSON_COMPACT=1
export JSON_COMPACT
1 change: 0 additions & 1 deletion test/suites/encoding-flags/compact-object/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
JSON_COMPACT=1
HASHSEED=1
export JSON_COMPACT HASHSEED
1 change: 0 additions & 1 deletion test/suites/encoding-flags/ensure-ascii/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
JSON_ENSURE_ASCII=1
export JSON_ENSURE_ASCII
1 change: 0 additions & 1 deletion test/suites/encoding-flags/indent-array/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
JSON_INDENT=4
export JSON_INDENT
1 change: 0 additions & 1 deletion test/suites/encoding-flags/indent-compact-array/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
JSON_INDENT=4
JSON_COMPACT=1
export JSON_INDENT JSON_COMPACT
1 change: 0 additions & 1 deletion test/suites/encoding-flags/indent-compact-object/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
JSON_INDENT=4
JSON_COMPACT=1
HASHSEED=1
export JSON_INDENT JSON_COMPACT HASHSEED
1 change: 0 additions & 1 deletion test/suites/encoding-flags/indent-object/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
JSON_INDENT=4
HASHSEED=1
export JSON_INDENT HASHSEED
1 change: 0 additions & 1 deletion test/suites/encoding-flags/object/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
HASHSEED=1
export HASHSEED
1 change: 0 additions & 1 deletion test/suites/encoding-flags/preserve-order/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
JSON_PRESERVE_ORDER=1
export JSON_PRESERVE_ORDER
1 change: 0 additions & 1 deletion test/suites/encoding-flags/real-precision/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
JSON_REAL_PRECISION=4
export JSON_REAL_PRECISION
1 change: 0 additions & 1 deletion test/suites/encoding-flags/sort-keys/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
JSON_SORT_KEYS=1
export JSON_SORT_KEYS
3 changes: 0 additions & 3 deletions test/suites/valid/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down