[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@35cb46e [master] check existence of Makefile before running make

[HIGUCHI D. (V. d. <nu...@co...>]

HIGUCHI Daisuke (VDR dai)	2017-07-20 10:09:44 +0900 (Thu, 20 Jul 2017)

  New Revision: 35cb46ea9bfed1aa7df9eb143942126a52728672
  https://github.com/ruby-gnome2/ruby-gnome2/commit/35cb46ea9bfed1aa7df9eb143942126a52728672

  Merged 2b63116: Merge pull request #1065 from dai-vdr/check-exist-makefile-before-make

  Message:
    check existence of Makefile before running make

  Modified files:
    cairo-gobject/test/run-test.rb
    glib2/test/run-test.rb
    gobject-introspection/test/run-test.rb

  Modified: cairo-gobject/test/run-test.rb (+1 -1)
===================================================================
--- cairo-gobject/test/run-test.rb    2017-07-17 21:35:37 +0900 (e4be75f)
+++ cairo-gobject/test/run-test.rb    2017-07-20 10:09:44 +0900 (39de9aa)
@@ -29,7 +29,7 @@ modules = [
   [cairo_gobject_base, "cairo-gobject"],
 ]
 modules.each do |target, module_name|
-  if system("which make > /dev/null")
+  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(false)
   end
   $LOAD_PATH.unshift(File.join(target, "ext", module_name))

  Modified: glib2/test/run-test.rb (+1 -1)
===================================================================
--- glib2/test/run-test.rb    2017-07-17 21:35:37 +0900 (08216db)
+++ glib2/test/run-test.rb    2017-07-20 10:09:44 +0900 (4c38040)
@@ -22,7 +22,7 @@ top = File.expand_path(File.join(base, ".."))
 $LOAD_PATH.unshift(top)
 require 'test/glib-test-init'
 
-if system("which make > /dev/null")
+if File.exist?("#{top}/Makefile") and system("which make > /dev/null")
   system("cd #{top.dump} && make > /dev/null") or exit(1)
 end
 

  Modified: gobject-introspection/test/run-test.rb (+1 -1)
===================================================================
--- gobject-introspection/test/run-test.rb    2017-07-17 21:35:37 +0900 (bd26f85)
+++ gobject-introspection/test/run-test.rb    2017-07-20 10:09:44 +0900 (35c2a8c)
@@ -27,7 +27,7 @@ modules = [
   [gobject_introspection_base, "gobject-introspection"]
 ]
 modules.each do |target, module_name|
-  if system("which make > /dev/null")
+  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(false)
   end
   $LOAD_PATH.unshift(File.join(target, "ext", module_name))