diff --git a/build-tools/scripts/UnitTestApks.targets b/build-tools/scripts/UnitTestApks.targets index ba4524c29de..b66fcc08552 100644 --- a/build-tools/scripts/UnitTestApks.targets +++ b/build-tools/scripts/UnitTestApks.targets @@ -146,11 +146,14 @@ - <_DefinitionsFilename Condition=" '%(UnitTestApk.TimingDefinitionsFilename)' == '' ">$(MSBuildThisFileDirectory)/TimingDefinitions.txt - <_DefinitionsFilename Condition=" '%(UnitTestApk.TimingDefinitionsFilename)' != '' ">%(UnitTestApk.TimingDefinitionsFilename) - <_LogcatFilenameEnd>-logcat-$(Configuration)$(_AotName).txt + <_LogcatFilename>logcat-$(Configuration)$(_AotName).txt - - + + diff --git a/src/Mono.Android/Test/Mono.Android-Tests.projitems b/src/Mono.Android/Test/Mono.Android-Tests.projitems index 51854ea4fd0..65b62e182ce 100644 --- a/src/Mono.Android/Test/Mono.Android-Tests.projitems +++ b/src/Mono.Android/Test/Mono.Android-Tests.projitems @@ -2,7 +2,7 @@ - <_MonoAndroidTestResultsPath>$(MSBuildThisFileDirectory)..\..\..\TestResult-Mono.Android_Tests-$(Configuration)$(_AotName).xml + <_MonoAndroidTestResultsPath>$(MSBuildThisFileDirectory)..\..\..\TestResult-Mono.Android_Tests.xml <_MonoAndroidTestPackage>Mono.Android_Tests <_MonoAndroidTestApkFile>$(OutputPath)Mono.Android_Tests-Signed.apk <_MonoAndroidTestApkSizesInput>apk-sizes-$(_MonoAndroidTestPackage)-$(Configuration)$(_AotName).txt @@ -12,10 +12,11 @@ $(_MonoAndroidTestPackage) xamarin.android.runtimetests.TestInstrumentation $(_MonoAndroidTestResultsPath) + $(MSBuildThisFileDirectory)timing-definitions-$(Configuration)$(_AotName).txt - + diff --git a/src/Mono.Android/Test/timing-definitions-Debug.txt b/src/Mono.Android/Test/timing-definitions-Debug.txt new file mode 100644 index 00000000000..171cf2ef150 --- /dev/null +++ b/src/Mono.Android/Test/timing-definitions-Debug.txt @@ -0,0 +1,6 @@ +# measure time of last monodroid-timing message appearance +last-Debug=monodroid-timing:\s+(?.*)$ + +# measure time of runtime and JNIEnv initialization end +init-Debug=monodroid-timing:\s+(?Runtime\.init: end native-to-managed.*)$ +JNI.init-Debug=monodroid-timing:\s+(?JNIEnv\.Initialize end:.*)$ diff --git a/src/Mono.Android/Test/timing-definitions-Release-Aot.txt b/src/Mono.Android/Test/timing-definitions-Release-Aot.txt new file mode 100644 index 00000000000..997b3182cd7 --- /dev/null +++ b/src/Mono.Android/Test/timing-definitions-Release-Aot.txt @@ -0,0 +1,6 @@ +# measure time of last monodroid-timing message appearance +last-Release-Aot=monodroid-timing:\s+(?.*)$ + +# measure time of runtime and JNIEnv initialization end +init-Release-Aot=monodroid-timing:\s+(?Runtime\.init: end native-to-managed.*)$ +JNI.init-Release-Aot=monodroid-timing:\s+(?JNIEnv\.Initialize end:.*)$ diff --git a/src/Mono.Android/Test/timing-definitions-Release.txt b/src/Mono.Android/Test/timing-definitions-Release.txt new file mode 100644 index 00000000000..458b47320db --- /dev/null +++ b/src/Mono.Android/Test/timing-definitions-Release.txt @@ -0,0 +1,6 @@ +# measure time of last monodroid-timing message appearance +last-Release=monodroid-timing:\s+(?.*)$ + +# measure time of runtime and JNIEnv initialization end +init-Release=monodroid-timing:\s+(?Runtime\.init: end native-to-managed.*)$ +JNI.init-Release=monodroid-timing:\s+(?JNIEnv\.Initialize end:.*)$ diff --git a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.projitems b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.projitems index 344b7d95dfa..22e17d970c1 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.projitems +++ b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.projitems @@ -5,6 +5,7 @@ Xamarin.Android.JcwGen_Tests xamarin.android.jcwgentests.TestInstrumentation $(MSBuildThisFileDirectory)..\..\..\TestResult-Xamarin.Android.JcwGen_Tests.xml + $(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\TimingDefinitions.txt diff --git a/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.projitems b/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.projitems index 633fcad5d0e..6639fcfe41c 100644 --- a/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.projitems +++ b/tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.projitems @@ -5,6 +5,7 @@ Xamarin.Android.Locale_Tests xamarin.android.localetests.TestInstrumentation $(MSBuildThisFileDirectory)..\..\..\TestResult-Xamarin.Android.Locale_Tests.xml + $(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\TimingDefinitions.txt