diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-22 22:23:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-22 22:23:28 (GMT) |
| commit | 0591cf1bf8c064c78c576490d675745c87fadf24 (patch) | |
| tree | 583fc701a0d2026dd248e1363ce502387a4f27b0 /tests | |
| parent | 75fe228fca63ec1c27a6bcc1093241a400a84532 (diff) | |
| parent | 7e4f656d18e37183ffa7ac4d9d93e5f2b0ec09ed (diff) | |
| download | tk-0591cf1bf8c064c78c576490d675745c87fadf24.zip tk-0591cf1bf8c064c78c576490d675745c87fadf24.tar.gz tk-0591cf1bf8c064c78c576490d675745c87fadf24.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/constraints.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/constraints.tcl b/tests/constraints.tcl index a87499d..c77fb00 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -190,7 +190,7 @@ testConstraint nonUnixUserInteraction [expr { [testConstraint userInteraction] || ([testConstraint unix] && [testConstraint notAqua]) }] -testConstraint haveDISPLAY [info exists env(DISPLAY)] +testConstraint haveDISPLAY [expr {[info exists env(DISPLAY)] && [testConstraint x11]}] testConstraint altDisplay [info exists env(TK_ALT_DISPLAY)] testConstraint noExceed [expr { ![testConstraint unix] || [catch {font actual "\{xyz"}] |