From 8bdabb239e349833ee60c793cd720c44b1fc5b8f Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Tue, 2 Jan 2024 03:07:11 +0000 Subject: [PATCH] Add another inline-table overwrite test case --- cmd/toml-test/main.go | 6 +----- .../inline-table/{overwrite-1.toml => overwrite-01.toml} | 0 .../inline-table/{overwrite-2.toml => overwrite-02.toml} | 0 .../inline-table/{overwrite-3.toml => overwrite-03.toml} | 0 .../inline-table/{overwrite-4.toml => overwrite-04.toml} | 0 .../inline-table/{overwrite-5.toml => overwrite-05.toml} | 0 .../inline-table/{overwrite-6.toml => overwrite-06.toml} | 0 .../inline-table/{overwrite-7.toml => overwrite-07.toml} | 0 .../inline-table/{overwrite-8.toml => overwrite-08.toml} | 0 .../inline-table/{overwrite-9.toml => overwrite-09.toml} | 0 tests/invalid/inline-table/overwrite-10.toml | 4 ++++ tests/valid/spec/float-2.json | 4 ++-- 12 files changed, 7 insertions(+), 7 deletions(-) rename tests/invalid/inline-table/{overwrite-1.toml => overwrite-01.toml} (100%) rename tests/invalid/inline-table/{overwrite-2.toml => overwrite-02.toml} (100%) rename tests/invalid/inline-table/{overwrite-3.toml => overwrite-03.toml} (100%) rename tests/invalid/inline-table/{overwrite-4.toml => overwrite-04.toml} (100%) rename tests/invalid/inline-table/{overwrite-5.toml => overwrite-05.toml} (100%) rename tests/invalid/inline-table/{overwrite-6.toml => overwrite-06.toml} (100%) rename tests/invalid/inline-table/{overwrite-7.toml => overwrite-07.toml} (100%) rename tests/invalid/inline-table/{overwrite-8.toml => overwrite-08.toml} (100%) rename tests/invalid/inline-table/{overwrite-9.toml => overwrite-09.toml} (100%) create mode 100644 tests/invalid/inline-table/overwrite-10.toml diff --git a/cmd/toml-test/main.go b/cmd/toml-test/main.go index 52a2459..06e991c 100644 --- a/cmd/toml-test/main.go +++ b/cmd/toml-test/main.go @@ -40,11 +40,7 @@ func parseFlags() (tomltest.Runner, []string, int, string, bool, bool) { printSkip = f.Bool(false, "print-skip") intAsFloat = f.Bool(false, "int-as-float") errors = f.String("", "errors") - // TODO: ideally I'd like to set this even lower, but this stupid - // toml-rb is ridiculously slow and sometimes hits ~800ms on my laptop. - // See if we can improve that, and should probably split up some of - // these larger valid tests too. - timeout = f.String("1s", "timeout") + timeout = f.String("1s", "timeout") ) zli.F(f.Parse()) if help.Bool() { diff --git a/tests/invalid/inline-table/overwrite-1.toml b/tests/invalid/inline-table/overwrite-01.toml similarity index 100% rename from tests/invalid/inline-table/overwrite-1.toml rename to tests/invalid/inline-table/overwrite-01.toml diff --git a/tests/invalid/inline-table/overwrite-2.toml b/tests/invalid/inline-table/overwrite-02.toml similarity index 100% rename from tests/invalid/inline-table/overwrite-2.toml rename to tests/invalid/inline-table/overwrite-02.toml diff --git a/tests/invalid/inline-table/overwrite-3.toml b/tests/invalid/inline-table/overwrite-03.toml similarity index 100% rename from tests/invalid/inline-table/overwrite-3.toml rename to tests/invalid/inline-table/overwrite-03.toml diff --git a/tests/invalid/inline-table/overwrite-4.toml b/tests/invalid/inline-table/overwrite-04.toml similarity index 100% rename from tests/invalid/inline-table/overwrite-4.toml rename to tests/invalid/inline-table/overwrite-04.toml diff --git a/tests/invalid/inline-table/overwrite-5.toml b/tests/invalid/inline-table/overwrite-05.toml similarity index 100% rename from tests/invalid/inline-table/overwrite-5.toml rename to tests/invalid/inline-table/overwrite-05.toml diff --git a/tests/invalid/inline-table/overwrite-6.toml b/tests/invalid/inline-table/overwrite-06.toml similarity index 100% rename from tests/invalid/inline-table/overwrite-6.toml rename to tests/invalid/inline-table/overwrite-06.toml diff --git a/tests/invalid/inline-table/overwrite-7.toml b/tests/invalid/inline-table/overwrite-07.toml similarity index 100% rename from tests/invalid/inline-table/overwrite-7.toml rename to tests/invalid/inline-table/overwrite-07.toml diff --git a/tests/invalid/inline-table/overwrite-8.toml b/tests/invalid/inline-table/overwrite-08.toml similarity index 100% rename from tests/invalid/inline-table/overwrite-8.toml rename to tests/invalid/inline-table/overwrite-08.toml diff --git a/tests/invalid/inline-table/overwrite-9.toml b/tests/invalid/inline-table/overwrite-09.toml similarity index 100% rename from tests/invalid/inline-table/overwrite-9.toml rename to tests/invalid/inline-table/overwrite-09.toml diff --git a/tests/invalid/inline-table/overwrite-10.toml b/tests/invalid/inline-table/overwrite-10.toml new file mode 100644 index 0000000..da5d1b1 --- /dev/null +++ b/tests/invalid/inline-table/overwrite-10.toml @@ -0,0 +1,4 @@ +# Set implicit "b", overwrite "b" (illegal!) and then set another implicit. +# +# Caused panic: https://github.com/BurntSushi/toml/issues/403 +a = {b.a = 1, b = 2, b.c = 3} diff --git a/tests/valid/spec/float-2.json b/tests/valid/spec/float-2.json index 67e5521..ee8dff3 100644 --- a/tests/valid/spec/float-2.json +++ b/tests/valid/spec/float-2.json @@ -1,11 +1,11 @@ { "sf1": { "type": "float", - "value": "+inf" + "value": "inf" }, "sf2": { "type": "float", - "value": "+inf" + "value": "inf" }, "sf3": { "type": "float",