Skip to content

Commit

Permalink
No test arg anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
Frank Langelage authored and Frank Langelage committed Aug 22, 2014
1 parent d153f99 commit 327c9b5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
9 changes: 3 additions & 6 deletions build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set CLASSPATH=
set M2_HOME=
set MAVEN_HOME=
set MAVEN_OPTS=%MAVEN_OPTS% -Xmx768M
powershell "& "tools\download-maven.ps1"
powershell -noprofile -executionpolicy bypass -file "tools\download-maven.ps1"

REM ******************************************************
REM - "for" loops have been unrolled for compatibility
Expand Down Expand Up @@ -83,14 +83,11 @@ REM ************* Execute Batch file only once ***********
REM ******************************************************

:ExecuteBatch
echo Calling %1 %2 %3 %4 %5 %6 %7 %8
set GOAL=%2
if "%GOAL%"=="" set GOAL=install

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
echo Calling %1 %GOAL% %3 %4 %5 %6 %7 %8
call %1 %GOAL% %3 %4 %5 %6 %7 %8

:end

Expand Down
8 changes: 1 addition & 7 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,8 @@ main() {
# to be in the same directory as build.xml.
cd $DIRNAME


. testsuite/groupDefs.sh

# Add smoke integration test directives before calling maven.
# Add default settings before calling maven.
MVN_SETTINGS_XML_ARGS="-s tools/maven/conf/settings.xml"
TESTS=$SMOKE_TESTS
MVN_GOAL="";
ADDIT_PARAMS="";
# For each parameter, check for testsuite directives.
Expand All @@ -182,8 +178,6 @@ main() {
# Default goal if none specified.
if [ -z "$MVN_GOAL" ]; then MVN_GOAL="install"; fi

MVN_GOAL="$MVN_GOAL $TESTS"

# Export some stuff for maven.
export MVN MAVEN_HOME MVN_OPTS MVN_GOAL

Expand Down

0 comments on commit 327c9b5

Please sign in to comment.