* instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into

  rbconfig.rb. (backported from CVS HEAD)

* ext/socket/extconf.rb (sockaddr_storage): winsock2.h have the
  definition of struct sockaddr_storage, but socket.c doesn't
  include it because this version of ruby still has binary level
  compatibility with winsock1.

* lib/mkmf.rb (create_makefile): should support header files in
  depend file.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 4 deletions

diff --git a/rubytest.rb b/rubytest.rb
index 6f717a2b60..8ae637c00e 100644
--- a/rubytest.rb
+++ b/rubytest.rb
@@ -1,12 +1,14 @@
 #! ./miniruby
 
+exit if defined?(CROSS_COMPILING)
 load './rbconfig.rb'
 include Config
 
-unless File.exist? "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}"
-  print "./#{CONFIG['ruby_install_name']} is not found.\n"
+ruby = "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}"
+unless File.exist? ruby
+  print "#{ruby} is not found.\n"
   print "Try `make' first, then `make test', please.\n"
-  exit 1
+  exit false
 end
 
 if File.exist? CONFIG['LIBRUBY_SO']
@@ -34,7 +36,8 @@ end
 $stderr.reopen($stdout)
 error = ''
 
-`./#{CONFIG["ruby_install_name"]}#{CONFIG["EXEEXT"]} -I#{CONFIG["srcdir"]}/lib #{CONFIG["srcdir"]}/sample/test.rb`.each do |line|
+srcdir = File.dirname(__FILE__)
+`#{ruby} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each do |line|
   if line =~ /^end of test/
     print "test succeeded\n"
     exit 0