test/run-test.rb in gtk3-3.4.3 vs test/run-test.rb in gtk3-3.4.4

- old
+ new

@@ -1,8 +1,8 @@ #!/usr/bin/env ruby # -# Copyright (C) 2013-2020 Ruby-GNOME Project Team +# Copyright (C) 2013-2021 Ruby-GNOME Project Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either # version 2.1 of the License, or (at your option) any later version. @@ -14,64 +14,22 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -require "fileutils" +require_relative "../../glib2/test/run-test" -build_dir = File.expand_path(".") - -ruby_gnome_base = File.join(__dir__, "..", "..") -ruby_gnome_base = File.expand_path(ruby_gnome_base) - -glib_base = File.join(ruby_gnome_base, "glib2") -gobject_introspection_base = File.join(ruby_gnome_base, "gobject-introspection") -atk_base = File.join(ruby_gnome_base, "atk") -cairo_gobject_base = File.join(ruby_gnome_base, "cairo-gobject") -pango_base = File.join(ruby_gnome_base, "pango") -gdk_pixbuf_base = File.join(ruby_gnome_base, "gdk_pixbuf2") -gio2_base = File.join(ruby_gnome_base, "gio2") -gdk3_base = File.join(ruby_gnome_base, "gdk3") -gtk3_base = File.join(ruby_gnome_base, "gtk3") - -[ - [glib_base, "glib2"], - [gobject_introspection_base, "gobject-introspection"], - [atk_base, "atk"], - [cairo_gobject_base, "cairo-gobject"], - [pango_base, "pango"], - [gdk_pixbuf_base, "gdk_pixbuf2"], - [gio2_base, "gio2"], - [gdk3_base, "gdk3"], - [gtk3_base, "gtk3"] -].each do |target, module_name| - if File.exist?(File.join(target, "Makefile")) - if system("which make > /dev/null") - `make -C #{target.dump} > /dev/null` or exit(false) - end - $LOAD_PATH.unshift(File.join(target, "ext", module_name)) - end - $LOAD_PATH.unshift(File.join(target, "lib")) +run_test(__dir__, + [ + "glib2", + "gobject-introspection", + "atk", + "cairo-gobject", + "gdk_pixbuf2", + "gio2", + "pango", + "gdk3", + "gtk3", + ]) do |context| + ENV["GTK3_FIXTURE_DIR"] = context[:build_fixture_dir] + require_relative "gtk-test-utils" end - -source_fixture_dir = File.join(gtk3_base, "test", "fixture") -build_fixture_dir = File.join(build_dir, "test", "fixture") -unless source_fixture_dir == build_fixture_dir - FileUtils.rm_rf(build_fixture_dir) - FileUtils.mkdir_p(File.dirname(build_fixture_dir)) - FileUtils.cp_r(source_fixture_dir, build_fixture_dir) -end -Dir.chdir(build_fixture_dir) do - system("rake") or exit(false) -end - -$LOAD_PATH.unshift(File.join(glib_base, "test")) -require 'glib-test-init' - -$LOAD_PATH.unshift(File.join(gtk3_base, "test")) -require 'gtk-test-utils' - -require 'gtk3' - -Gtk.init - -exit Test::Unit::AutoRunner.run(true, File.join(gtk3_base, "test"))