In the middle of moving

build.bat

@@ -84,8 +84,13 @@ REM ******************************************************
 echo Calling %1 %2 %3 %4 %5 %6 %7 %8
 set GOAL=%2
 if "%GOAL%"=="" set GOAL=install
-call %1 %GOAL% %3 %4 %5 %6 %7 %8
+
+REM run smoke tests by default
+set SMOKE_TESTS=-Dintegration.module -Dsmoke.integration.tests
+
+call %1 %GOAL% %SMOKE_TESTS% %3 %4 %5 %6 %7 %8
 
 :end
 
 if "%NOPAUSE%" == "" pause
+

build.sh

@@ -159,12 +159,26 @@ main() {
     if [ -z "$MVN_GOAL" ]; then
       MVN_GOAL="install"
     fi
-
+
+    . testsuite/groupDefs.sh
+
+    # add smoke integration test directives before calling maven
+    TESTS=$SMOKE_TESTS
+    # for each parameter, check for testsuite directives
+    for param in $@ ; do
+      case $param in
+        -DallTests)
+          TESTS=$ALL_TESTS ;;
+      esac
+    done
+
+    MVN_GOAL="$MVN_GOAL $TESTS"
+
     # export some stuff for maven
     export MVN MAVEN_HOME MVN_OPTS MVN_GOAL
 
     echo "$MVN $MVN_OPTIONS $MVN_GOAL"
-    
+
     # execute in debug mode, or simply execute
     if [ "x$MVN_DEBUG" != "x" ]; then
 	  /bin/sh -x $MVN $MVN_OPTIONS $MVN_GOAL

integration-tests.bat

@@ -0,0 +1,164 @@
+@echo off
+REM  ======================================================================
+REM
+REM  This is the main entry point for the build system.
+REM
+REM  Users should be sure to execute this file rather than 'mvn' to ensure
+REM  the correct version is being used with the correct configuration.
+REM
+REM  ======================================================================
+REM
+REM $Id: build.bat 105735 2010-06-04 19:45:13Z pgier $
+REM
+REM Authors:
+REM     Jason Dillon <jason@planet57.com>
+REM     Sacha Labourey <sacha.labourey@cogito-info.ch>
+REM
+
+REM ******************************************************
+REM Ignore the MAVEN_HOME variable: we want to use *our*
+REM Maven version and associated JARs.
+REM ******************************************************
+REM Ignore the users classpath, cause it might mess
+REM things up
+REM ******************************************************
+
+SETLOCAL
+
+set PROGNAME=%0
+set DIRNAME=%~p0
+
+set CLASSPATH=
+set M2_HOME=
+set MAVEN_HOME=
+
+REM ******************************************************
+REM - "for" loops have been unrolled for compatibility
+REM   with some WIN32 systems.
+REM ******************************************************
+
+set NAMES=tools;tools\maven;tools\apache\maven
+set SUBFOLDERS=.;..;..\..;..\..\..;..\..\..\..
+
+REM ******************************************************
+REM ******************************************************
+
+SET EXECUTED=FALSE
+for %%i in (%NAMES%) do call :subLoop %%i %1 %2 %3 %4 %5 %6
+
+goto :EOF
+
+
+REM ******************************************************
+REM ********* Search for names in the subfolders *********
+REM ******************************************************
+
+:subLoop
+for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\mvn.bat %2 %3 %4 %5 %6 %7
+
+goto :EOF
+
+
+REM ******************************************************
+REM ************ Test if Maven Batch file exists ***********
+REM ******************************************************
+
+:testIfExists
+if exist %1 call :BatchFound %1 %2 %3 %4 %5 %6 %7 %8
+
+goto :EOF
+
+
+REM ******************************************************
+REM ************** Batch file has been found *************
+REM ******************************************************
+
+:BatchFound
+if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %2 %3 %4 %5 %6 %7 %8
+set EXECUTED=TRUE
+
+goto :EOF
+
+REM ******************************************************
+REM ************* Execute Batch file only once ***********
+REM ******************************************************
+
+:ExecuteBatch
+
+REM Support for testsuite profile processing
+set CMD_LINE_PARAMS=
+set TESTS_SPECIFIED=N
+
+REM each test module executes a different type of test
+set API_TESTS=-Dapi.module
+set BENCHMARK_TESTS=-Dbenchmark.module
+set INTEGRATION_TESTS=-Dintegration.module -Dbasic.integration.tests -Dcompat.integration.tests -Dclustering.integration.tests -Dtimerservice.integration.tests
+set SMOKE_TESTS=-Dintegration.module -Dsmoke.integration.tests
+set SPEC_TESTS=-Dspec.module
+set STRESS_TESTS=-Dstress.module
+set DOMAIN_TESTS=-Ddomain.module
+
+set MVN=%1%
+set GOAL=%2
+if "%GOAL%"=="" set GOAL=install
+
+REM process test directives before calling maven
+call :processTestDirectives %GOAL% %3 %4 %5 %6 %7 %8
+
+REM change to testsuite directory before executing mvn
+cd %DIRNAME%\testsuite
+
+echo Calling ..\%MVN% %CMD_LINE_PARAMS%
+call ..\%MVN% %CMD_LINE_PARAMS%
+
+cd %DIRNAME%
+
+REM Pause the batch script when maven terminates
+if "%NOPAUSE%" == "" pause
+
+goto :EOF
+
+REM ******************************************************
+REM **** Function to process testsuite directives ********
+REM ******************************************************
+:processTestDirectives
+
+REM echo "Calling processTestDirectives %*"
+:loop
+
+REM check if we have no more parameters to process
+if "%1" == "" (
+  if "%TESTS_SPECIFIED%" == "N" set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %SMOKE_TESTS%"
+  goto :eof
+)
+REM Replace occurrences of directives with corresponding maven profiles
+REM -DallTests
+if "%1" == "-DallTests" (
+  set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %INTEGRATION_TESTS% %SPEC_TESTS% %API_TESTS% %DOMAIN_TESTS%"
+  set "TESTS_SPECIFIED=Y"
+  goto processed
+)
+REM -Dbenchmark-tests
+if "%1" == "-Dbenchmark-tests" (
+  set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %BENCHMARK_TESTS%"
+  set "TESTS_SPECIFIED=Y"
+  goto processed
+)
+REM -Dsmoke-tests
+if "%1" == "-Dsmoke-tests" (
+  set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %SMOKE_TESTS%"
+  set "TESTS_SPECIFIED=Y"
+  goto processed
+)
+REM -Dstress-tests
+if "%1" == "-Dstress-tests" (
+  set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %STRESS_TESTS%"
+  set "TESTS_SPECIFIED=Y"
+  goto processed
+)
+REM pass through other params
+set "CMD_LINE_PARAMS=%CMD_LINE_PARAMS% %1"
+
+:processed
+shift
+goto loop