From 015263fb0ea306125f24245bc4c2678f243f8957 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 7 Apr 2023 17:34:23 +0200 Subject: [PATCH] Trying to fix unit test fails --- src/tl/tl/tlFileUtils.cc | 5 ++++- testdata/ruby/dbNetlistReaderTests.rb | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/tl/tl/tlFileUtils.cc b/src/tl/tl/tlFileUtils.cc index 9707f3c54..e575dbb63 100644 --- a/src/tl/tl/tlFileUtils.cc +++ b/src/tl/tl/tlFileUtils.cc @@ -53,6 +53,7 @@ # include # include # include +# include #else @@ -884,8 +885,10 @@ get_home_path () return tl::get_env ("HOMEDRIVE") + tl::get_env ("HOMEPATH"); } else if (tl::has_env ("HOMESHARE") && tl::has_env ("HOMEPATH")) { return tl::get_env ("HOMESHARE") + tl::get_env ("HOMEPATH"); + } else if (tl::has_env ("USERPROFILE")) { + return tl::get_env ("USERPROFILE"); } - tl::warn << tl::to_string (tr ("Unable to get home directory (no HOMEDRIVE/HOMEPATH or HOMESHARE/HOMEPATH environment variables)")); + tl::warn << tl::to_string (tr ("Unable to get home directory (no HOMEDRIVE/HOMEPATH, HOMESHARE/HOMEPATH or USERPROFILE environment variables)")); #endif return std::string ("."); } diff --git a/testdata/ruby/dbNetlistReaderTests.rb b/testdata/ruby/dbNetlistReaderTests.rb index 4ef69884f..5080d9373 100644 --- a/testdata/ruby/dbNetlistReaderTests.rb +++ b/testdata/ruby/dbNetlistReaderTests.rb @@ -186,6 +186,14 @@ END rescue Exception => ex msg = ex.message end + + # normalize paths for Windows + msg = msg.gsub("\\", "/") + input = input.gsub("\\", "/") + + puts "INFO: msg is '#{msg}'" + puts "INFO: input is '#{input}'" + assert_equal(msg.sub(input, ""), "Nothing implemented in , line 22 in Netlist::read") assert_equal(nl.description, "Read by MyDelegate")