Skip to content

Commit

Permalink
[xharness] Automatically generate xharness make dependencies. (#8324)
Browse files Browse the repository at this point in the history
  • Loading branch information
rolfbjarne authored Apr 13, 2020
1 parent 7ac67e6 commit f3ee011
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 3 additions & 1 deletion tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,10 @@ $(TOP)/tools/common/SdkVersions.cs: $(TOP)/tools/common/SdkVersions.cs.in
@$(MAKE) -C $(TOP)/src project-files
@touch $@

xharness/xharness.exe: $(wildcard xharness/*.cs) $(wildcard $(TOP)/tools/bcl-test-importer/BCLTestImporter/*.cs) xharness/xharness.csproj $(TOP)/tools/common/SdkVersions.cs test.config test-system.config .stamp-src-project-files
xharness/xharness.exe: $(xharness_dependencies) test.config test-system.config .stamp-src-project-files
$(Q_GEN) $(SYSTEM_MSBUILD) /restore $(MSBUILD_VERBOSITY_QUIET) xharness/xharness.csproj
xharness/xharness.csproj.inc: export ABSOLUTE_PATHS=1
-include xharness/xharness.csproj.inc

killall:
@killall "iPhone Simulator" >/dev/null 2>&1 || true
Expand Down
1 change: 1 addition & 0 deletions tests/xharness/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
xharness.csproj.inc
tmp-test-dir

6 changes: 4 additions & 2 deletions tools/common/create-makefile-fragment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ for proj in $(sort "$REFERENCES_PATH" | uniq); do
sed -i '' "s@^@$proj_dir/@" "$inputs_path"

# Change to Make syntax. This is horrifically difficult in MSBuild,
# because MSBuild blindly replaces backslashes with forword slashes (i.e.
# because MSBuild blindly replaces backslashes with forward slashes (i.e.
# windows paths to unix paths...)
sed -i '' "s_^\\(.*\\)\$_ \\1 \\\\_" "$inputs_path"

Expand All @@ -103,7 +103,9 @@ echo "${PROJECT}_dependencies = \\" >> "$FRAGMENT_PATH"
sort "${INPUT_PATHS[@]}" | uniq >> "$FRAGMENT_PATH"

# Simplify paths somewhat by removing the current directory
sed -i '' "s@$PROJECT_DIR/@@" "$FRAGMENT_PATH"
if test -z "$ABSOLUTE_PATHS"; then
sed -i '' "s@$PROJECT_DIR/@@" "$FRAGMENT_PATH"
fi

# Cleanup
rm -f "${INPUT_PATHS[@]}"

2 comments on commit f3ee011

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚧 Experimental DDFun pipeline

🔥 Device tests completed (Failed) on iOS-DDFun on Azure DevOps(iOS-DDFun) 🔥

🔥 Tests failed catastrophically (no summary found)

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build was (probably) aborted

🔥 Jenkins job (on internal Jenkins) failed in stage(s) 'Running XM tests on '10.11', Running XM tests on '10.10', Running XM tests on '10.12', Running XM tests on '10.14', Running XM tests on '10.13', Running XM tests on '10.9', Running XM tests on '10.9'' 🔥

Build succeeded
✅ Packages:

API Diff (from stable)
API Diff (from PR only) (no change)
Generator Diff (no change)
🔥 Xamarin.Mac tests on 10.11 failed: Xamarin.Mac tests on macOS 10.11 failed (apitest) 🔥
🔥 Xamarin.Mac tests on 10.10 failed: Xamarin.Mac tests on macOS 10.10 failed (apitest) 🔥
🔥 Xamarin.Mac tests on 10.12 failed: Xamarin.Mac tests on macOS 10.12 failed (apitest) 🔥
🔥 Xamarin.Mac tests on 10.14 failed: Xamarin.Mac tests on macOS 10.14 failed (apitest) 🔥
🔥 Xamarin.Mac tests on 10.13 failed: Xamarin.Mac tests on macOS 10.13 failed (apitest) 🔥
🔥 Xamarin.Mac tests on 10.9 failed: Xamarin.Mac tests on macOS 10.9 failed (apitest) 🔥
🔥 Test run failed 🔥

Test results

3 tests failed, 182 tests passed.

Failed tests

  • mmptest/macOS/Debug: BuildFailure
  • Generator tests/NUnit: Failed (Execution failed with exit code 5)
  • Generator tests/.NET: Failed (Execution failed with exit code 1)

Please sign in to comment.