Skip to content

Commit 327c9b5

Browse files
Frank LangelageFrank Langelage
Frank Langelage
authored and
Frank Langelage
committedAug 22, 2014
No test arg anymore
1 parent d153f99 commit 327c9b5

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed
 

‎build.bat

+3-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ set CLASSPATH=
2929
set M2_HOME=
3030
set MAVEN_HOME=
3131
set MAVEN_OPTS=%MAVEN_OPTS% -Xmx768M
32-
powershell "& "tools\download-maven.ps1"
32+
powershell -noprofile -executionpolicy bypass -file "tools\download-maven.ps1"
3333

3434
REM ******************************************************
3535
REM - "for" loops have been unrolled for compatibility
@@ -83,14 +83,11 @@ REM ************* Execute Batch file only once ***********
8383
REM ******************************************************
8484

8585
:ExecuteBatch
86-
echo Calling %1 %2 %3 %4 %5 %6 %7 %8
8786
set GOAL=%2
8887
if "%GOAL%"=="" set GOAL=install
8988

90-
REM run smoke tests by default
91-
set SMOKE_TESTS=-Dintegration.module -Dsmoke.integration.tests
92-
93-
call %1 %GOAL% %SMOKE_TESTS% %3 %4 %5 %6 %7 %8
89+
echo Calling %1 %GOAL% %3 %4 %5 %6 %7 %8
90+
call %1 %GOAL% %3 %4 %5 %6 %7 %8
9491

9592
:end
9693

‎build.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,8 @@ main() {
156156
# to be in the same directory as build.xml.
157157
cd $DIRNAME
158158

159-
160-
. testsuite/groupDefs.sh
161-
162-
# Add smoke integration test directives before calling maven.
159+
# Add default settings before calling maven.
163160
MVN_SETTINGS_XML_ARGS="-s tools/maven/conf/settings.xml"
164-
TESTS=$SMOKE_TESTS
165161
MVN_GOAL="";
166162
ADDIT_PARAMS="";
167163
# For each parameter, check for testsuite directives.
@@ -182,8 +178,6 @@ main() {
182178
# Default goal if none specified.
183179
if [ -z "$MVN_GOAL" ]; then MVN_GOAL="install"; fi
184180

185-
MVN_GOAL="$MVN_GOAL $TESTS"
186-
187181
# Export some stuff for maven.
188182
export MVN MAVEN_HOME MVN_OPTS MVN_GOAL
189183

0 commit comments

Comments
 (0)
Please sign in to comment.