disable openjdk=... and jdk tests if arch flag specified

These combinations generally won't work, since the JAVA_HOME JDK will
tend to match the native, default architecture, not the one specified.
This commit is contained in:
Joel Dice 2015-03-13 15:28:14 -06:00
parent b35f236066
commit d6c9d3c2d0

View File

@ -86,7 +86,7 @@ else
make_target=test
run make jdk-test
(! has_flag arch) && run make ${flags} jdk-test
run make ${flags} ${make_target}
run make ${flags} mode=debug ${make_target}
run make ${flags} process=interpret ${make_target}
@ -95,7 +95,7 @@ else
run make ${flags} mode=debug bootimage=true ${make_target} && \
run make ${flags} bootimage=true ${make_target}
(! has_flag openjdk && ! has_flag android) && \
(! has_flag openjdk && ! has_flag android && ! has_flag arch) && \
run make ${flags} openjdk=$JAVA_HOME ${make_target}
run make ${flags} tails=true continuations=true heapdump=true ${make_target}