summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
-rw-r--r--src/value.cc4
-rw-r--r--tests/CMakeLists.txt1
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 4ab4cf0..6556377 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "libraries/MCAD"]
path = libraries/MCAD
- url = git@github.com:openscad/MCAD.git
+ url = ../MCAD.git
diff --git a/src/value.cc b/src/value.cc
index 48fea1a..c9dbd55 100644
--- a/src/value.cc
+++ b/src/value.cc
@@ -426,6 +426,10 @@ std::string Value::toString() const
// Quick and dirty hack to work around floating point rounding differences
// across platforms for testing purposes.
{
+ if (this->num != this->num) { // Fix for avoiding nan vs. -nan across platforms
+ stream << "nan";
+ break;
+ }
std::stringstream tmp;
tmp.precision(12);
tmp.setf(std::ios_base::fixed);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0e74f58..881a750 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -657,6 +657,7 @@ disable_tests(dumptest_transform-tests
dumptest_render-tests
dumptest_difference-tests
dumptest_intersection-tests
+ dumptest_text-search-test
dumptest_example001
dumptest_example005
dumptest_example006
contact: Jan Huwald // Impressum