File tree 2 files changed +4
-13
lines changed
2 files changed +4
-13
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ set CLASSPATH=
29
29
set M2_HOME =
30
30
set MAVEN_HOME =
31
31
set MAVEN_OPTS = %MAVEN_OPTS% -Xmx768M
32
- powershell " & " tools\download-maven.ps1"
32
+ powershell -noprofile -executionpolicy bypass -file " tools\download-maven.ps1"
33
33
34
34
REM ******************************************************
35
35
REM - "for" loops have been unrolled for compatibility
@@ -83,14 +83,11 @@ REM ************* Execute Batch file only once ***********
83
83
REM ******************************************************
84
84
85
85
:ExecuteBatch
86
- echo Calling %1 %2 %3 %4 %5 %6 %7 %8
87
86
set GOAL = %2
88
87
if " %GOAL% " == " " set GOAL = install
89
88
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
94
91
95
92
:end
96
93
Original file line number Diff line number Diff line change @@ -156,12 +156,8 @@ main() {
156
156
# to be in the same directory as build.xml.
157
157
cd $DIRNAME
158
158
159
-
160
- . testsuite/groupDefs.sh
161
-
162
- # Add smoke integration test directives before calling maven.
159
+ # Add default settings before calling maven.
163
160
MVN_SETTINGS_XML_ARGS=" -s tools/maven/conf/settings.xml"
164
- TESTS=$SMOKE_TESTS
165
161
MVN_GOAL=" " ;
166
162
ADDIT_PARAMS=" " ;
167
163
# For each parameter, check for testsuite directives.
@@ -182,8 +178,6 @@ main() {
182
178
# Default goal if none specified.
183
179
if [ -z " $MVN_GOAL " ]; then MVN_GOAL=" install" ; fi
184
180
185
- MVN_GOAL=" $MVN_GOAL $TESTS "
186
-
187
181
# Export some stuff for maven.
188
182
export MVN MAVEN_HOME MVN_OPTS MVN_GOAL
189
183
You can’t perform that action at this time.
0 commit comments