@@ -208,9 +208,12 @@ public void ExplicitPackageNamingPolicy ()
208208 }
209209 }
210210
211+ static readonly string GetMacOSMicrosoftJdkPathsOverrideName = "GetMacOSMicrosoftJdkPaths jdks override! Xamarin.Android.Tools.JdkInfo, Xamarin.Android.Tools.AndroidSdk, Version=1.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065" ;
212+
211213 [ Test ]
212214 public void CheckSignApk ( [ Values ( true , false ) ] bool useApkSigner , [ Values ( true , false ) ] bool perAbiApk )
213215 {
216+ Console . WriteLine ( $ "# jonp: CheckSignApk({ useApkSigner } , { perAbiApk } ): JDKs overridden? { AppDomain . CurrentDomain . GetData ( GetMacOSMicrosoftJdkPathsOverrideName ) } ") ;
214217 string ext = Environment . OSVersion . Platform != PlatformID . Unix ? ".bat" : "" ;
215218 var foundApkSigner = Directory . EnumerateDirectories ( Path . Combine ( AndroidSdkPath , "build-tools" ) ) . Any ( dir => Directory . EnumerateFiles ( dir , "apksigner" + ext ) . Any ( ) ) ;
216219 if ( useApkSigner && ! foundApkSigner ) {
@@ -229,10 +232,15 @@ public void CheckSignApk ([Values(true, false)] bool useApkSigner, [Values(true,
229232 using ( var b = CreateApkBuilder ( Path . Combine ( "temp" , TestContext . CurrentContext . Test . Name ) ) ) {
230233 b . Verbosity = Microsoft . Build . Framework . LoggerVerbosity . Diagnostic ;
231234 Assert . IsTrue ( b . Build ( proj ) , "build failed" ) ;
232- Assert . IsTrue ( StringAssertEx . ContainsText ( b . LastBuildOutput , " 0 Warning(s)" ) ) ;
235+ if ( ! StringAssertEx . ContainsText ( b . LastBuildOutput , " 0 Warning(s)" ) ) {
236+ Console . WriteLine ( $ "-- BEGIN CheckSignApk({ useApkSigner } , { perAbiApk } ) output--") ;
237+ Console . WriteLine ( b . LastBuildOutput ) ;
238+ Console . WriteLine ( $ "-- END CheckSignApk({ useApkSigner } , { perAbiApk } ) output--") ;
239+ }
240+ Assert . IsTrue ( StringAssertEx . ContainsText ( b . LastBuildOutput , " 0 Warning(s)" ) , "First build should not contain warnings!" ) ;
233241 proj . AndroidResources . First ( ) . Timestamp = null ;
234242 Assert . IsTrue ( b . Build ( proj ) , "Second build failed" ) ;
235- Assert . IsTrue ( StringAssertEx . ContainsText ( b . LastBuildOutput , " 0 Warning(s)" ) ) ;
243+ Assert . IsTrue ( StringAssertEx . ContainsText ( b . LastBuildOutput , " 0 Warning(s)" ) , "Second build should not contain warnings!" ) ;
236244 }
237245 }
238246
0 commit comments