Skip to content

Commit

Permalink
yes, another minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
broskoTT committed Sep 25, 2024
1 parent ee3d334 commit 98eb0f0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/ubuntu-22.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ FROM ubuntu:22.04

ENV DEBIAN_FRONTEND=noninteractive

COPY install_common.sh /install_common.sh
RUN chmod +x /install_common.sh && /install_common.sh
COPY docker_install_common.sh /docker_install_common.sh
RUN chmod +x /docker_install_common.sh && /docker_install_common.sh

5 changes: 3 additions & 2 deletions tests/test_utils/generate_cluster_desc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ namespace test_utils {
inline std::string GetAbsPath(std::string path_){
// Note that __FILE__ might be resolved at compile time to an absolute or relative address, depending on the compiler.
std::filesystem::path current_file_path = std::filesystem::path(__FILE__);
std::filesystem::path umd_root;
if (current_file_path.is_absolute()) {
std::filesystem::path umd_root = current_file_path.parent_path().parent_path().parent_path();
umd_root = current_file_path.parent_path().parent_path().parent_path();
} else {
std::filesystem::path umd_root_relative = std::filesystem::relative(std::filesystem::path(__FILE__).parent_path().parent_path().parent_path(), "../");
std::filesystem::path umd_root = std::filesystem::canonical(umd_root_relative);
umd_root = std::filesystem::canonical(umd_root_relative);
}
std::filesystem::path abs_path = umd_root / path_;
return abs_path.string();
Expand Down

0 comments on commit 98eb0f0

Please sign in to comment.