try to fix ci

pocoproject · Mar 6, 2024 · 7be383a · 7be383a
1 parent ca66cd0
commit 7be383a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -530,8 +530,7 @@ jobs:
         class CppUnit::TestCaller<class ICMPClientTest>.testBigPing,
         class CppUnit::TestCaller<class ICMPSocketTest>.testMTU,
         class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy,
-        class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy,
-        class CppUnit::TestCaller<class ProcessRunnerTest>.testProcessRunner # cmake CI has messed up env path
+        class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
     steps:
       - uses: actions/checkout@v3
       - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON

diff --git a/Foundation/include/Poco/Any.h b/Foundation/include/Poco/Any.h
@@ -388,6 +388,9 @@ class Any
 	template <typename ValueType>
 	friend ValueType* AnyCast(Any*);
 
+	template <typename ValueType>
+	friend const ValueType* AnyCast(const Any*);
+
 	template <typename ValueType>
 	friend ValueType* UnsafeAnyCast(Any*);
 
@@ -426,7 +429,9 @@ const ValueType* AnyCast(const Any* operand)
 	///	 const MyType* pTmp = AnyCast<MyType>(pAny).
 	/// Returns nullptr if the types don't match.
 {
-	return AnyCast<ValueType>(const_cast<Any*>(operand));
+	return operand && operand->type() == typeid(ValueType)
+				? &static_cast<const Any::Holder<ValueType>*>(operand->content())->_held
+				: nullptr;
 }
 
 

diff --git a/Foundation/src/File.cpp b/Foundation/src/File.cpp
@@ -118,14 +118,26 @@ std::string File::absolutePath() const
 					StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
 				for (const auto& p: st)
 				{
-					std::string fileName(p);
-					if (p.size() && p[p.size()-1] != Path::separator())
-						fileName.append(1, Path::separator());
-					fileName.append(path());
-					if (File(fileName).exists())
+					try
 					{
-						ret = fileName;
-						break;
+						std::string fileName(p);
+						if (p.size() && p[p.size()-1] != Path::separator())
+							fileName.append(1, Path::separator());
+						fileName.append(path());
+						if (File(fileName).exists())
+						{
+							ret = fileName;
+							break;
+						}
+					}
+					catch (const Poco::PathSyntaxException&)
+					{
+						// this try/catch is only here to prevent windows cmake CI from failing
+						// (apparently bad windows path settings in the CI environment):
+						//
+						// class CppUnit::TestCaller<class ProcessRunnerTest>.testProcessRunner
+						// "class Poco::PathSyntaxException:
+						// Bad path syntax: D:/a/poco/poco/cmake-build/bin:C:\Program Files\PowerShell\7\TestApp"
 					}
 				}
 			}

diff --git a/Foundation/testsuite/src/AnyTest.cpp b/Foundation/testsuite/src/AnyTest.cpp
@@ -134,7 +134,7 @@ void AnyTest::testAnyCastToReference()
 
 	int&                ra    = AnyCast<int &>(a);
 	int const&          ra_c  = AnyCast<int const &>(a);
-	// NOTE: The following two AnyCasts will trigger the
+	// NOTE: The volatile AnyCasts will trigger the
 	// undefined behavior sanitizer.
 	int volatile&       ra_v  = AnyCast<int volatile &>(a);
 	int const volatile& ra_cv = AnyCast<int const volatile&>(a);