Skip to content

[test] disable web tests if davix is OFF #18458

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 4 commits into from
Apr 24, 2025
Merged

[test] disable web tests if davix is OFF #18458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38a8b7e
[test] disable web tests if davix is OFF
ferdymercury Apr 22, 2025
7514a34
[test] simplify with already available option
ferdymercury Apr 22, 2025
edebfaf
[net] Prevent a trailing question mark when no options are specified
ferdymercury Apr 22, 2025
866961b
[test] guard also roottests with davix if
ferdymercury Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions io/io/test/TFileTests.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ void TestReadWithoutGlobalRegistrationIfPossible(const char *fname)
// https://github.com/root-project/root/issues/10742
#ifndef R__WIN32
// We prefer not to read remotely files from Windows, if possible
#ifdef R__HAS_DAVIX
TEST(TFile, ReadWithoutGlobalRegistrationWeb)
{
const auto webFile = "http://root.cern/files/h1/dstarmb.root";
Expand All @@ -140,6 +141,7 @@ TEST(TFile, ReadWithoutGlobalRegistrationNet)
const auto netFile = "root://eospublic.cern.ch//eos/root-eos/h1/dstarmb.root";
TestReadWithoutGlobalRegistrationIfPossible(netFile);
}
#endif
#endif

// https://github.com/root-project/root/issues/16189
Expand Down
6 changes: 4 additions & 2 deletions net/net/src/TWebFile.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,10 @@ void TWebFile::SetMsgReadBuffer10(const char *redirectLocation, Bool_t tempRedir
fBasicUrl += fUrl.GetPort();
fBasicUrl += "/";
fBasicUrl += fUrl.GetFile();
fBasicUrl += "?";
fBasicUrl += fUrl.GetOptions();
if (strlen(fUrl.GetOptions())) {
fBasicUrl += "?";
fBasicUrl += fUrl.GetOptions();
}
}

if (fMsgReadBuffer10 == "") {
Expand Down
2 changes: 1 addition & 1 deletion roottest/python/cmdLineUtils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ ROOTTEST_ADD_TEST(LongRootls4
OUTREF LongRootls4.ref
ENVIRONMENT ${test_env})

if(NOT MSVC) # Windows cannot yet read https
if(davix AND NOT MSVC) # davix is optional ; Windows cannot yet read https
ROOTTEST_ADD_TEST(WebRootls1
COMMAND ${TOOLS_PREFIX}/rootls${pyext} -1 http://root.cern.ch/files/pippa.root
OUTREF WebRootls.ref
Expand Down
2 changes: 1 addition & 1 deletion roottest/root/io/webfile/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
#
#-------------------------------------------------------------------------------
if(geom)
if(geom AND davix)
ROOTTEST_ADD_OLDTEST()
endif()
Loading