Skip to content

Fix windows nightly tests #1

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
Ris-Bali wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix windows nightly tests #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions .github/workflows/ci-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
name: Windows Nightly

on:
# pull_request: {} # Uncomment only to test this WF file update.
pull_request:
branches:
- '**'
schedule:
# 9:00 PM Central
- cron: '0 2 * * *'
Expand Down Expand Up @@ -33,7 +35,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: ${{ github.repository }}
ref: ${{ env.BASE_BRANCH_NAME }}
ref: ${{ github.event_name == 'pull_request' && github.head_ref || env.BASE_BRANCH_NAME }}
path: nightly/llvm-project/llvm/tools/eld
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion test/Common/standalone/PluginAPI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ target_include_directories(ELDExpectedUsage
PRIVATE ${CMAKE_SOURCE_DIR}/include/eld/PluginAPI)
target_link_libraries(ELDExpectedUsage PRIVATE LW)
set_target_properties(ELDExpectedUsage PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/bin/tests)
${LLVM_BINARY_DIR}/bin/tests)
set_target_properties(ELDExpectedUsage PROPERTIES INSTALL_RPATH "\$ORIGIN/../../lib")
18 changes: 0 additions & 18 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,24 +551,6 @@ else:

# Add substitutions.

# For multi-config generators (Visual Studio, Xcode), binaries are in config subdirectories
# We need to detect this at runtime by checking which path exists
def find_config_dir(base_path):
"""Find the configuration directory for multi-config generators."""
import os
# Try common configuration names
for config_name in ['Release', 'Debug', 'RelWithDebInfo', 'MinSizeRel']:
if os.path.exists(os.path.join(base_path, config_name)):
return "/" + config_name
# No config subdirectory found (single-config generator)
return ""

# Determine config directory by checking if Release/Debug subdirectories exist
config_dir = ""
if config.llvm_obj_root:
test_path = os.path.join(config.llvm_obj_root, "bin", "tests")
config_dir = find_config_dir(test_path)

config.substitutions.append( ("%config", config_dir))
config.substitutions.append( ("%xlen", str(xlen)))
config.substitutions.append( ("%triple","".join(config.target_triple)) )
Expand Down
Loading