diff -r 64093c7a1f5c -r cac7fca94e7a components/ruby/ruby-18/Makefile --- a/components/ruby/ruby-18/Makefile Fri Jun 06 13:28:45 2014 -0700 +++ b/components/ruby/ruby-18/Makefile Mon Jun 09 10:06:37 2014 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -145,6 +145,10 @@ CONFIGURE_OPTIONS += --with-curses-dir=/usr CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" +# Also check rubygems source directory for files, since files in +# lib/rubygems/ssl_cert are not installed into the proto area. +PKG_PROTO_DIRS += $(SOURCE_DIR_1) + include $(WS_TOP)/make-rules/shared-targets.mk # common targets @@ -158,6 +162,25 @@ # test_step_ruby_core_35753(TestRange) test: $(TEST_32) +# Note: testing rubygems requires the ruby 1.8 gems rake (v0.8.7+), +# hoe (v2.4.0+), and minitest (v1.3.1+), which are not in Solaris, +# so, as a normal user, first install the ruby 1.8 gems locally +# (in your ~/.gem directory): +# gem18 install --user-install rake -v0.8.7 +# gem18 install --user-install hoe -v2.4.0 +# gem18 install --user-install minitest -v1.3.1 +# +# Go to the rubygems source directory just below this component directory: +# cd rubygems-1.3.5 +# +# And call the locally-installed rake to run the rubygems tests: +# ~/.gem/ruby/1.8/bin/rake +# +# There is one expected Error for the rubygems tests: +# test_handle_options_port(TestGemCommandsServerCommand): +# OptionParser::InvalidArgument: invalid argument: -p http: no such named service + + # install rubygems using ruby installed in proto area $(RUBYGEMS_INSTALL_TARGET): $(INSTALL_32) (cd $(COMPONENT_SRC_1); $(ENV) - \