Fix tests

akheron · Mar 21, 2024 · de07bb9 · de07bb9
1 parent 421da51
commit de07bb9
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -535,6 +535,11 @@ if (NOT JANSSON_WITHOUT_TESTS)
          if (IS_DIRECTORY ${TESTDIR})
             get_filename_component(TNAME ${TESTDIR} NAME)
 
+            if ((USE_DTOA AND EXISTS ${TESTDIR}/skip_if_dtoa) OR
+                (NOT USE_DTOA AND EXISTS ${TESTDIR}/skip_unless_dtoa))
+               continue()
+            endif()
+
             if (JANSSON_TEST_WITH_VALGRIND)
                add_test(memcheck__${SUITE}__${TNAME}
                         ${MEMCHECK_COMMAND} ${SUITE_TEST_CMD} ${TESTDIR})

diff --git a/test/suites/valid/real-exponent-no-dtoa/input b/test/suites/valid/real-exponent-no-dtoa/input
@@ -0,0 +1 @@
+[123e45]
diff --git a/test/suites/valid/real-exponent-no-dtoa/output b/test/suites/valid/real-exponent-no-dtoa/output
@@ -0,0 +1 @@
+[1.2299999999999999e47]
diff --git a/test/suites/valid/real-exponent-no-dtoa/skip_if_dtoa b/test/suites/valid/real-exponent-no-dtoa/skip_if_dtoa
diff --git a/test/suites/valid/real-exponent/output b/test/suites/valid/real-exponent/output
@@ -1 +1 @@
-[1.2299999999999999e47]
+[1.23e47]
diff --git a/test/suites/valid/real-exponent/skip_unless_dtoa b/test/suites/valid/real-exponent/skip_unless_dtoa
diff --git a/test/suites/valid/run b/test/suites/valid/run
@@ -8,11 +8,22 @@
 JSON_SORT_KEYS=1
 export JSON_SORT_KEYS
 
+dtoa_enabled() {
+    grep -q "DTOA_ENABLED 1" $top_builddir/jansson_private_config.h
+}
+
 is_test() {
     test -d $test_path
 }
 
 do_run() {
+    if [ -f $test_path/skip_unless_dtoa ]; then
+        dtoa_enabled || return 77
+    fi
+    if [ -f $test_path/skip_if_dtoa ]; then
+        dtoa_enabled && return 77
+    fi
+
     variant=$1
     s=".$1"