Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XDISPLAY to AVAILABLE_DISPLAY varname #3

Closed
wants to merge 1 commit into from
Closed

XDISPLAY to AVAILABLE_DISPLAY varname #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions testHeadlessComponents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ function run_swing_component_test_set {
TEST_BOOL=$2

echo "---------------------------------------------------------------------"
echo "use -Djava.awt.headless=$TEST_BOOL and set display to $XDISPLAY"
echo "use -Djava.awt.headless=$TEST_BOOL and set display to $AVAILABLE_DISPLAY"
echo "---------------------------------------------------------------------"
export DISPLAY=$XDISPLAY
export DISPLAY=$AVAILABLE_DISPLAY
run_java_with_headless $TEST_BOOL $TEST_ARGUMENT

}
Expand Down Expand Up @@ -162,7 +162,7 @@ for testOption in compatible incompatible; do
resArray["jre_headless_${testOption}_${headless}_display_unset"]=$?
fi

if [[ "x$XDISPLAY" == *x* ]] ; then
if [[ "x$AVAILABLE_DISPLAY" == *x* ]] ; then
echo "skipping tests with display set, as the default display was not defined"
else
run_swing_component_test_set ${testOption} ${headless} >> $LOGFILE 2>&1
Expand Down