edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Ruby/Builtins/RubyModule.cs;C1589426 File: RubyModule.cs =================================================================== --- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Ruby/Builtins/RubyModule.cs;C1589426 (server) 2/12/2010 1:21 PM +++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Ruby/Builtins/RubyModule.cs;ar @@ -1168,9 +1168,11 @@ result = false; } - if (_namespaceTracker != null && _namespaceTracker.TryGetValue(SymbolTable.StringToId(name), out value)) { + object namespaceValue; + if (_namespaceTracker != null && _namespaceTracker.TryGetValue(SymbolTable.StringToId(name), out namespaceValue)) { _constants[name] = ConstantStorage.Removed; _context.ConstantAccessVersion++; + value = namespaceValue; result = true; } else if (result) { _constants.Remove(name); =================================================================== edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Tests/Scripts/utr.rb;C1570153 File: utr.rb =================================================================== --- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Tests/Scripts/utr.rb;C1570153 (server) 2/12/2010 12:39 PM +++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Tests/Scripts/utr.rb;ar @@ -6,7 +6,7 @@ def parse_options(args) require "optparse" parser = OptionParser.new(args) do |opts| - opts.banner = "USAGE: utr libname [-a] [-g] [-t TestClass#test_method]" + opts.banner = "USAGE: utr libname [-a] [-g] [-t TestClass#test_method] [-- ]" opts.separator "" @@ -26,10 +26,21 @@ opts.on_tail("-h", "--help", "Show this message") do |n| puts opts + puts + puts "Test::Unit help:" + require "rubygems" + require "test/unit" + require "test/unit/autorunner" + $0 = "" + Test::Unit::AutoRunner.new(true).process_args(["-h"]) exit end + + opts.on_tail("--", "Pass the remaining options to Test::Unit") do |n| + o.terminate + end end - + remaining_args = parser.parse! abort "Please specify the test suite to use" if remaining_args.empty? test_suite = remaining_args.shift =================================================================== edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Tests/Scripts/utr/active_record_tests.rb;C1589071 File: active_record_tests.rb =================================================================== --- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Tests/Scripts/utr/active_record_tests.rb;C1589071 (server) 2/12/2010 12:55 PM +++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Tests/Scripts/utr/active_record_tests.rb;ar @@ -304,13 +304,6 @@ # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\Marsha :test_can_marshal_has_one_association_with_nil_target - disable HasOneThroughAssociationsTest, - # NoMethodError: undefined method `[]' for nil:NilClass - # fixtures.rb:882:in `setup_fixture_accessors' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\Enumerable.cs:83:in `b__3' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Extensions\IListOps.cs:834:in `each' - :test_has_one_through_proxy_should_not_respond_to_private_methods - disable InvalidDateTest, # Exception raised: # Class: @@ -335,31 +328,6 @@ # System.Data:0:in `GetValueInternal' :test_native_types - disable ReflectionTest, - # NameError: uninitialized constant ReflectionTest::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/reflection_test.rb:105:in `test_has_many_reflection' - # dependencies.rb:90:in `const_missing' - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/Ruby/ruby-1.8.6p368/lib/ruby/gems/1.8/gems/test-unit-2.0.5/lib/test/unit/testsuite.rb:37:in `run' - :test_has_many_reflection, - # NameError: uninitialized constant ReflectionTest::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/reflection_test.rb:117:in `test_has_one_reflection' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_has_one_reflection, - # NameError: uninitialized constant ReflectionTest::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/reflection_test.rb:173:in `test_reflection_of_all_associations' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_reflection_of_all_associations, - # Exception raised: - # Class: - # Message: <"uninitialized constant ReflectionTest::Firm"> - # ---Backtrace--- - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/reflection_test.rb:180:in `test_reflection_should_not_raise_error_when_compared_to_other_object' - # dependencies.rb:90:in `const_missing' - # assertions.rb:358:in `assert_nothing_raised - :test_reflection_should_not_raise_error_when_compared_to_other_object - disable TestAutosaveAssociationOnAHasManyAssociation, # exception expected but was # Class: @@ -371,144 +339,6 @@ # autosav :test_should_rollback_any_changes_if_an_exception_occurred_while_saving - disable TestDefaultAutosaveAssociationOnABelongsToAssociation, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnABelongsToAssociation::Client - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:184:in `test_assignment_before_either_saved' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_assignment_before_either_saved, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnABelongsToAssociation::Client - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:171:in `test_assignment_before_parent_saved' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_assignment_before_parent_saved, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnABelongsToAssociation::Client - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:141:in `test_should_save_parent_but_not_invalid_child' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_should_save_parent_but_not_invalid_child - - disable TestDefaultAutosaveAssociationOnAHasManyAssociation, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasManyAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:343:in `test_adding_before_save' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_adding_before_save, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasManyAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:368:in `test_assign_ids' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_assign_ids, - # ActiveRecord::SubclassNotFound: The single-table inheritance mechanism failed to locate the subclass: 'Firm'. This error is raised because the column 'type' is reserved for storing the class in case of inheritance. Please rename this column if you didn't intend it to be used for storing the inheritance class or overwrite Company.inheritance_column to use another column for that information. - # base.rb:1620:in `instantiate' - # base.rb:661:in `find_by_sql' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Extensions\IListOps.cs:666:in `collect!' - :test_build_before_save, - # ActiveRecord::SubclassNotFound: The single-table inheritance mechanism failed to locate the subclass: 'Firm'. This error is raised because the column 'type' is reserved for storing the class in case of inheritance. Please rename this column if you didn't intend it to be used for storing the inheritance class or overwrite Company.inheritance_column to use another column for that information. - # base.rb:1620:in `instantiate' - # base.rb:661:in `find_by_sql' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Extensions\IListOps.cs:666:in `collect!' - :test_build_many_before_save, - # ActiveRecord::SubclassNotFound: The single-table inheritance mechanism failed to locate the subclass: 'Firm'. This error is raised because the column 'type' is reserved for storing the class in case of inheritance. Please rename this column if you didn't intend it to be used for storing the inheritance class or overwrite Company.inheritance_column to use another column for that information. - # base.rb:1620:in `instantiate' - # base.rb:661:in `find_by_sql' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Extensions\IListOps.cs:666:in `collect!' - :test_build_many_via_block_before_save, - # ActiveRecord::SubclassNotFound: The single-table inheritance mechanism failed to locate the subclass: 'Firm'. This error is raised because the column 'type' is reserved for storing the class in case of inheritance. Please rename this column if you didn't intend it to be used for storing the inheritance class or overwrite Company.inheritance_column to use another column for that information. - # base.rb:1620:in `instantiate' - # base.rb:661:in `find_by_sql' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Extensions\IListOps.cs:666:in `collect!' - :test_build_via_block_before_save, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasManyAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:283:in `test_invalid_adding' - # dependencies.rb:90:in `const_missing' - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/Ruby/ruby-1.8.6p368/lib/ruby/gems/1.8/gems/test-unit-2.0.5/lib/test/unit/testsuite.rb:37:in `run' - :test_invalid_adding, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasManyAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:292:in `test_invalid_adding_before_save' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_invalid_adding_before_save, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasManyAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:305:in `test_invalid_adding_with_validate_false' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_invalid_adding_with_validate_false, - # ActiveRecord::SubclassNotFound: The single-table inheritance mechanism failed to locate the subclass: 'Firm'. This error is raised because the column 'type' is reserved for storing the class in case of inheritance. Please rename this column if you didn't intend it to be used for storing the inheritance class or overwrite Company.inheritance_column to use another column for that information. - # base.rb:1620:in `instantiate' - # base.rb:661:in `find_by_sql' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Extensions\IListOps.cs:666:in `collect!' - :test_invalid_build, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasManyAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:430:in `test_replace_on_new_object' - # dependencies.rb:90:in `const_missing' - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/Ruby/ruby-1.8.6p368/lib/ruby/gems/1.8/gems/test-unit-2.0.5/lib/test/unit/testsuite.rb:37:in `run' - :test_replace_on_new_object, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasManyAssociation::Client - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:316:in `test_valid_adding_with_validate_false' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_valid_adding_with_validate_false - - disable TestDefaultAutosaveAssociationOnAHasOneAssociation, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasOneAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:108:in `test_assignment_before_either_saved' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_assignment_before_either_saved, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasOneAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:98:in `test_assignment_before_parent_saved' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_assignment_before_parent_saved, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasOneAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:76:in `test_build_before_child_saved' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_build_before_child_saved, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasOneAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:87:in `test_build_before_either_saved' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_build_before_either_saved, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasOneAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:121:in `test_not_resaved_when_unchanged' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_not_resaved_when_unchanged, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasOneAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:53:in `test_save_fails_for_invalid_has_one' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_save_fails_for_invalid_has_one, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasOneAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:65:in `test_save_succeeds_for_invalid_has_one_with_validate_false' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_save_succeeds_for_invalid_has_one_with_validate_false, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnAHasOneAssociation::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:42:in `test_should_save_parent_but_not_invalid_child' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_should_save_parent_but_not_invalid_child - - disable TestDefaultAutosaveAssociationOnNewRecord, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnNewRecord::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:442:in `test_autosave_new_record_on_belongs_to_can_be_disabled_per_relationship' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_autosave_new_record_on_belongs_to_can_be_disabled_per_relationship, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnNewRecord::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:483:in `test_autosave_new_record_on_has_many_can_be_disabled_per_relationship' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_autosave_new_record_on_has_many_can_be_disabled_per_relationship, - # NameError: uninitialized constant TestDefaultAutosaveAssociationOnNewRecord::Firm - # d:/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/tests/RailsTests-2.3.5/activerecord/test/cases/autosave_association_test.rb:461:in `test_autosave_new_record_on_has_one_can_be_disabled_per_relationship' - # dependencies.rb:90:in `const_missing' - # D:\vs_langs01_s\Merlin\Main\Languages\Ruby\Libraries.LCA_RESTRICTED\Builtins\KernelOps.cs:778:in `__send__' - :test_autosave_new_record_on_has_one_can_be_disabled_per_relationship - disable TestDestroyAsPartOfAutosaveAssociation, # exception expected but was # Class: @@ -558,7 +388,6 @@ # ? ^ ^^ ^^ ^ :test_validates_length_of_using_within_utf8 - end end ===================================================================