xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[tests] Minor fixes wrt executing packaged macOS tests. (#12982) 

* Don't execute .NET tests in the 'legacy' targets (it's wasteful because
  we're already executing those .NET tests elsewhere).
* Fix reporting failures in the legacy tests.
This commit is contained in:
Rolf Bjarne Kvinge 2021-10-18 07:30:36 +02:00 коммит произвёл GitHub
Родитель 17641a8ccc
Коммит 6d065a7dcc
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 2 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
tests/packaged-macos-tests.mk
Просмотреть файл

@ -228,7 +228,7 @@ endif
build-$(1): .stamp-nuget-restore-mac
$$(Q) rm -f ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk build-legacy-$(1) || cat .$$@-legacy-failure.stamp >> ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk build-legacy-$(1) || echo "build-legacy-$(1) failed" >> ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk build-mac-dotnet-x64-$(1) || echo "build-mac-dotnet-x64-$(1) failed" >> ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk build-mac-dotnet-arm64-$(1) || echo "build-mac-dotnet-arm64-$(1) failed" >> ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk build-maccatalyst-dotnet-x64-$(1) || echo "build-maccatalyst-dotnet-x64-$(1) failed" >> ".$$@-failure.stamp"
@ -237,7 +237,7 @@ build-$(1): .stamp-nuget-restore-mac
exec-$(1):
$$(Q) rm -f ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk exec-legacy-$(1) || cat .$$@-legacy-failure.stamp >> ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk exec-legacy-$(1) || echo "exec-legacy-$(1) failed" >> ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk exec-mac-dotnet-x64-$(1) || echo "exec-mac-dotnet-x64-$(1) failed" >> ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk exec-mac-dotnet-arm64-$(1) || echo "exec-mac-dotnet-arm64-$(1) failed" >> ".$$@-failure.stamp"
$$(Q) $$(MAKE) -f packaged-macos-tests.mk exec-maccatalyst-dotnet-x64-$(1) || echo "exec-maccatalyst-dotnet-x64-$(1) failed" >> ".$$@-failure.stamp"
@ -290,17 +290,11 @@ exec-legacy-dontlink:
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-mac-modern-dontlink || echo "exec-mac-modern-dont link failed" >> ".$@-failure.stamp"
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-mac-full-dontlink || echo "exec-mac-full-dont link failed" >> ".$@-failure.stamp"
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-mac-system-dontlink || echo "exec-mac-system-dont link failed" >> ".$@-failure.stamp"
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-mac-dotnet-x64-dontlink || echo "exec-mac-dotnet-x64-dont link failed" >> ".$@-failure.stamp"
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-mac-dotnet-arm64-dontlink || echo "exec-mac-dotnet-arm64-dont link failed" >> ".$@-failure.stamp"
$(Q) if test -e ".$@-failure.stamp"; then cat ".$@-failure.stamp"; rm ".$@-failure.stamp"; exit 1; fi
exec-legacy-introspection:
$(Q) rm -f ".$@-failure.stamp"
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-mac-modern-introspection || echo "exec-mac-modern-introspection failed" >> ".$@-failure.stamp"
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-mac-dotnet-x64-introspection || echo "exec-mac-dotnet-x64-introspection failed" >> ".$@-failure.stamp"
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-mac-dotnet-arm64-introspection || echo "exec-mac-dotnet-arm64-introspection failed" >> ".$@-failure.stamp"
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-maccatalyst-dotnet-x64-introspection || echo "exec-maccatalyst-dotnet-x64-introspection failed" >> ".$@-failure.stamp"
$(Q) $(MAKE) -f packaged-macos-tests.mk exec-maccatalyst-dotnet-arm64-introspection || echo "exec-maccatalyst-dotnet-arm64-introspection failed" >> ".$@-failure.stamp"
$(Q) if test -e ".$@-failure.stamp"; then cat ".$@-failure.stamp"; rm ".$@-failure.stamp"; exit 1; fi
exec-xammac_tests: