You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2014/07/11 15:45:24 UTC
svn commit: r1609729 - in
/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its:
AbstractNPandayIntegrationTestCase.java NPANDAY_452_SilverlightAppTest.java
Author: brett
Date: Fri Jul 11 15:45:24 2014
New Revision: 1609729
URL: http://svn.apache.org/r1609729
Log:
adjustments for x64 servers
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java
Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java?rev=1609729&r1=1609728&r2=1609729&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java Fri Jul 11 15:45:24 2014
@@ -744,6 +744,13 @@ public abstract class AbstractNPandayInt
}
}
+ protected void skipIf64Bit() {
+ if (System.getenv( "PROGRAMFILES(X86)" ) != null) {
+ skip = true;
+ skipReason = "Only run on x86 servers";
+ }
+ }
+
protected void skipIfMavenVersion(String versionSpec) throws InvalidVersionSpecificationException, VerificationException {
VersionRange range = VersionRange.createFromVersionSpec( versionSpec );
String mavenVersion = findMavenVersion();
@@ -773,15 +780,15 @@ public abstract class AbstractNPandayInt
protected void skipIfXdtNotPresent()
{
- File f = new File( System.getenv( "PROGRAMFILES" ), "MSBuild" );
- f = new File( f, "Microsoft/VisualStudio" );
- File[] versions = f.listFiles();
- if ( versions != null ) {
- for ( File v : versions )
- {
- if ( new File( v, "Web/Microsoft.Web.Publishing.Tasks.dll" ).exists() )
- {
- return;
+ for ( String pf : new String[] { System.getenv( "PROGRAMFILES" ), System.getenv( "PROGRAMFILES(X86)" )}) {
+ File f = new File( pf, "MSBuild" );
+ f = new File( f, "Microsoft/VisualStudio" );
+ File[] versions = f.listFiles();
+ if ( versions != null ) {
+ for ( File v : versions ) {
+ if ( new File( v, "Web/Microsoft.Web.Publishing.Tasks.dll" ).exists() ) {
+ return;
+ }
}
}
}
Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java?rev=1609729&r1=1609728&r2=1609729&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java Fri Jul 11 15:45:24 2014
@@ -36,6 +36,8 @@ public class NPANDAY_452_SilverlightAppT
"Silverlight v3.0 SDK is not present" );
// required for ASP.NET packaging
skipIfMissingWebDeployV2();
+ // Silverlight doesn't play well here - may be something the tools can address in future
+ skipIf64Bit();
}
public void test()