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.

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

Description: Here the test looks for 64-bit binary alwasys and hence … #134

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions linux-tools/gtk2/gtk2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,20 @@ function run_test()

function test-query-modules()
{
tc_register "gtk-query-immodules-2.0-64 testing"
gtk-query-immodules-2.0-64 >$stdout 2>$stderr
tc_pass_or_fail $? "test failed"
tc_get_os_arch
if [[ $TC_OS_ARCH == "ppc" || $TC_OS_ARCH == "i686" ]]; then
tc_register "gtk-query-immodules-2.0-32 testing"
gtk-query-immodules-2.0-32 >$stdout 2>$stderr
else
tc_register "gtk-query-immodules-2.0-64 testing"
gtk-query-immodules-2.0-64 >$stdout 2>$stderr
fi

Copy link
Contributor

@athira-rajeev athira-rajeev Jan 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this check be made generic for any version ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good suggestion but I looked at different versions of gtk2 on different distros. All are providing the same library. So I think, we can consider this as generic one till there is any change.

[root@localhost ~]# rpm -ql gtk2-2.24.28-8.el7.ppc64le | grep gtk-query
/usr/bin/gtk-query-immodules-2.0-64

[root@localhost ~]# rpm -ql gtk2-2.24.31-1.el7.ppc64le | grep gtk-query
/usr/bin/gtk-query-immodules-2.0-64

[root@localhost ~]$ rpm -ql gtk2-2.24.30-1.fc24.i686 | grep gtk-query
/usr/bin/gtk-query-immodules-2.0-32

[root@localhost ~]$ rpm -ql gtk2-2.24.30-1.fc24.x86_64 | grep gtk-query
/usr/bin/gtk-query-immodules-2.0-64

tc_pass_or_fail $? "test failed"

tc_register "gtk-update-icon-cache"
gtk-update-icon-cache -v /usr/share/icons/hicolor/ >$stdout 2>$stderr
tc_pass_or_fail $? "test for gtk-update-icon-cache failed"
tc_register "gtk-update-icon-cache"
gtk-update-icon-cache -v /usr/share/icons/hicolor/ >$stdout 2>$stderr
tc_pass_or_fail $? "test for gtk-update-icon-cache failed"
}

################################################################################
Expand Down