diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-01 08:55:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-01 08:55:52 (GMT) |
| commit | 279143927533f7cdd980e4d1d239303cbc9e8a5a (patch) | |
| tree | b24fd9a432c7b045ea14b606c24808cf6238b515 /tests | |
| parent | af62bb859761fb78877f2b623732d200a2c07c5f (diff) | |
| download | tk-279143927533f7cdd980e4d1d239303cbc9e8a5a.zip tk-279143927533f7cdd980e4d1d239303cbc9e8a5a.tar.gz tk-279143927533f7cdd980e4d1d239303cbc9e8a5a.tar.bz2 | |
Expression for contraint failsOnUbuntuNoXft was reverse ....
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/entry.test | 2 | ||||
| -rw-r--r-- | tests/font.test | 2 | ||||
| -rw-r--r-- | tests/fontchooser.test | 2 | ||||
| -rw-r--r-- | tests/spinbox.test | 2 | ||||
| -rw-r--r-- | tests/textTag.test | 4 | ||||
| -rw-r--r-- | tests/unixFont.test | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/tests/entry.test b/tests/entry.test index f1d61b2..4463b9b 100644 --- a/tests/entry.test +++ b/tests/entry.test @@ -12,7 +12,7 @@ eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] -testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}] +testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}] # For xscrollcommand set scrollInfo {} diff --git a/tests/font.test b/tests/font.test index 0f4c8de..89780ba 100644 --- a/tests/font.test +++ b/tests/font.test @@ -15,7 +15,7 @@ tcltest::loadTestedCommands testConstraint fullutf [expr {[format %c 0x010000] != "\uFFFD"}] testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] -testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}] +testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}] set defaultfontlist [font names] diff --git a/tests/fontchooser.test b/tests/fontchooser.test index 0efe619..3ec7309 100644 --- a/tests/fontchooser.test +++ b/tests/fontchooser.test @@ -7,7 +7,7 @@ eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] -testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}] +testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}] # the following helper functions are related to the functions used # in winDialog.test where they are used to send messages to the win32 diff --git a/tests/spinbox.test b/tests/spinbox.test index 4cc1238..28d90d7 100644 --- a/tests/spinbox.test +++ b/tests/spinbox.test @@ -12,7 +12,7 @@ eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] -testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}] +testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}] # For xscrollcommand set scrollInfo {} diff --git a/tests/textTag.test b/tests/textTag.test index 6a7fc86..038150f 100644 --- a/tests/textTag.test +++ b/tests/textTag.test @@ -12,7 +12,7 @@ eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] -testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}] +testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}] destroy .t text .t -width 20 -height 10 @@ -1602,7 +1602,7 @@ test textTag-16.1 {TkTextPickCurrent procedure} -constraints { } -result {2.1 3.2 3.2 3.2 3.2 3.2 4.3} test textTag-16.2 {TkTextPickCurrent procedure} -constraints { - haveCourier12 + haveCourier12 failsOnUbuntuNoXft } -setup { .t tag delete {*}[.t tag names] wm geometry . +200+200 ; update diff --git a/tests/unixFont.test b/tests/unixFont.test index 973d4d9..86fb5bf 100644 --- a/tests/unixFont.test +++ b/tests/unixFont.test @@ -17,7 +17,7 @@ eval tcltest::configure $argv tcltest::loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] -testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}] +testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}] if {[tk windowingsystem] eq "x11"} { set xlsf [auto_execok xlsfonts] |