You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2012/08/23 07:21:44 UTC
svn commit: r1376367 - in /continuum/trunk/continuum-webapp-test/src/test:
example-projects/shell/ example-svn/db/ example-svn/db/revprops/
example-svn/db/revs/ testng/org/apache/continuum/web/test/
testng/org/apache/continuum/web/test/parent/
Author: batkinson
Date: Thu Aug 23 05:21:44 2012
New Revision: 1376367
URL: http://svn.apache.org/viewvc?rev=1376367&view=rev
Log:
Changed shell test to use .bat file instead of .sh when on windows.
Added:
continuum/trunk/continuum-webapp-test/src/test/example-projects/shell/build.bat (with props)
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/4
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/4 (with props)
Modified:
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedBuildTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
Added: continuum/trunk/continuum-webapp-test/src/test/example-projects/shell/build.bat
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-projects/shell/build.bat?rev=1376367&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-projects/shell/build.bat (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-projects/shell/build.bat Thu Aug 23 05:21:44 2012
@@ -0,0 +1,6 @@
+
+
+@echo off
+echo Build script...
+
+exit 0
\ No newline at end of file
Propchange: continuum/trunk/continuum-webapp-test/src/test/example-projects/shell/build.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Propchange: continuum/trunk/continuum-webapp-test/src/test/example-projects/shell/build.bat
------------------------------------------------------------------------------
svn:executable = *
Propchange: continuum/trunk/continuum-webapp-test/src/test/example-projects/shell/build.bat
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current?rev=1376367&r1=1376366&r2=1376367&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current (original)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current Thu Aug 23 05:21:44 2012
@@ -1 +1 @@
-3 7e 1
+4 7j 1
Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/4
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/4?rev=1376367&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/4 (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/4 Thu Aug 23 05:21:44 2012
@@ -0,0 +1,13 @@
+K 10
+svn:author
+V 5
+brent
+K 8
+svn:date
+V 27
+2012-08-23T04:48:10.024103Z
+K 7
+svn:log
+V 39
+Adding script for windows shell builds.
+END
Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/4
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/4?rev=1376367&view=auto
==============================================================================
Binary file - no diff available.
Propchange: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/4
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedBuildTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedBuildTest.java?rev=1376367&r1=1376366&r2=1376367&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedBuildTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedBuildTest.java Thu Aug 23 05:21:44 2012
@@ -246,7 +246,7 @@ public class DistributedBuildTest
private void editBuildDefinitionShellType()
{
- setFieldValue( "buildFile", "build.sh" );
+ setFieldValue( "buildFile", isWindows() ? "build.bat" : "build.sh" );
setFieldValue( "arguments", "" );
setFieldValue( "description", "description" );
setFieldValue( "buildDefinitionType", "shell" );
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java?rev=1376367&r1=1376366&r2=1376367&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java Thu Aug 23 05:21:44 2012
@@ -185,11 +185,4 @@ public class InstallationTest
String INSTALL_VAR_NAME = getProperty( "INSTALL_VAR_NAME" );
removeInstallation( INSTALL_VAR_NAME );
}
-
- public static boolean isWindows()
- {
- String os = System.getProperty( "os.name" ).toLowerCase();
- //windows
- return os.contains( "win" );
- }
}
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=1376367&r1=1376366&r2=1376367&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java Thu Aug 23 05:21:44 2012
@@ -1268,4 +1268,11 @@ public abstract class AbstractContinuumT
assertElementNotPresent( "xpath=" + xPath );
}
}
+
+ public static boolean isWindows()
+ {
+ String os = System.getProperty( "os.name" ).toLowerCase();
+ //windows
+ return os.contains( "win" );
+ }
}