Move test files back directly to test/.

2016-11-13 22:00:15 +01:00 · 2016-11-13 22:00:15 +01:00 · 7457af2b23
commit 7457af2b23
parent 9dc1f8f3cd
132 changed files with 3 additions and 3 deletions
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@ -44,8 +44,8 @@ module Homebrew
      # Make it easier to reproduce test runs.
      ENV["SEED"] = ARGV.next if ARGV.include? "--seed"
-      files = Dir.glob("test/test/**/*_test.rb")
+      files = Dir.glob("test/**/*_test.rb")
-                 .reject { |p| !OS.mac? && p.start_with?("test/test/os/mac/") }
+                 .reject { |p| !OS.mac? && p.start_with?("test/os/mac/") }
      opts = []
      opts << "--serialize-stdout" if ENV["CI"]
@ -55,7 +55,7 @@ module Homebrew
      if ARGV.value("only")
        test_name, test_method = ARGV.value("only").split(":", 2)
-        files = Dir.glob("test/test/{#{test_name},#{test_name}/**/*}_test.rb")
+        files = Dir.glob("test/{#{test_name},#{test_name}/**/*}_test.rb")
        args << "--name=test_#{test_method}" if test_method
      end
--- a/Library/Homebrew/test/test/ARGV_test.rb
+++ b/Library/Homebrew/test/test/ARGV_test.rb
--- a/Library/Homebrew/test/test/ENV_test.rb
+++ b/Library/Homebrew/test/test/ENV_test.rb
--- a/Library/Homebrew/test/test/analytics_test.rb
+++ b/Library/Homebrew/test/test/analytics_test.rb
--- a/Library/Homebrew/test/test/audit_test.rb
+++ b/Library/Homebrew/test/test/audit_test.rb
--- a/Library/Homebrew/test/test/bash_test.rb
+++ b/Library/Homebrew/test/test/bash_test.rb
--- a/Library/Homebrew/test/test/blacklist_test.rb
+++ b/Library/Homebrew/test/test/blacklist_test.rb
--- a/Library/Homebrew/test/test/bottle_collector_test.rb
+++ b/Library/Homebrew/test/test/bottle_collector_test.rb
--- a/Library/Homebrew/test/test/bottle_filename_test.rb
+++ b/Library/Homebrew/test/test/bottle_filename_test.rb
--- a/Library/Homebrew/test/test/bottle_hooks_test.rb
+++ b/Library/Homebrew/test/test/bottle_hooks_test.rb
--- a/Library/Homebrew/test/test/bottle_test.rb
+++ b/Library/Homebrew/test/test/bottle_test.rb
--- a/Library/Homebrew/test/test/build_environment_test.rb
+++ b/Library/Homebrew/test/test/build_environment_test.rb
--- a/Library/Homebrew/test/test/build_options_test.rb
+++ b/Library/Homebrew/test/test/build_options_test.rb
--- a/Library/Homebrew/test/test/bundle_test.rb
+++ b/Library/Homebrew/test/test/bundle_test.rb
--- a/Library/Homebrew/test/test/cache_formula_test.rb
+++ b/Library/Homebrew/test/test/cache_formula_test.rb
--- a/Library/Homebrew/test/test/cache_test.rb
+++ b/Library/Homebrew/test/test/cache_test.rb
--- a/Library/Homebrew/test/test/cask_test.rb
+++ b/Library/Homebrew/test/test/cask_test.rb
--- a/Library/Homebrew/test/test/cat_test.rb
+++ b/Library/Homebrew/test/test/cat_test.rb
--- a/Library/Homebrew/test/test/caveats_test.rb
+++ b/Library/Homebrew/test/test/caveats_test.rb
--- a/Library/Homebrew/test/test/cellar_formula_test.rb
+++ b/Library/Homebrew/test/test/cellar_formula_test.rb
--- a/Library/Homebrew/test/test/cellar_test.rb
+++ b/Library/Homebrew/test/test/cellar_test.rb
--- a/Library/Homebrew/test/test/checksum_test.rb
+++ b/Library/Homebrew/test/test/checksum_test.rb
--- a/Library/Homebrew/test/test/checksum_verification_test.rb
+++ b/Library/Homebrew/test/test/checksum_verification_test.rb
--- a/Library/Homebrew/test/test/cleaner_test.rb
+++ b/Library/Homebrew/test/test/cleaner_test.rb
--- a/Library/Homebrew/test/test/cleanup_test.rb
+++ b/Library/Homebrew/test/test/cleanup_test.rb
--- a/Library/Homebrew/test/test/command_test.rb
+++ b/Library/Homebrew/test/test/command_test.rb
--- a/Library/Homebrew/test/test/commands_test.rb
+++ b/Library/Homebrew/test/test/commands_test.rb
--- a/Library/Homebrew/test/test/compiler_failure_test.rb
+++ b/Library/Homebrew/test/test/compiler_failure_test.rb
--- a/Library/Homebrew/test/test/compiler_selector_test.rb
+++ b/Library/Homebrew/test/test/compiler_selector_test.rb
--- a/Library/Homebrew/test/test/config_test.rb
+++ b/Library/Homebrew/test/test/config_test.rb
--- a/Library/Homebrew/test/test/create_test.rb
+++ b/Library/Homebrew/test/test/create_test.rb
--- a/Library/Homebrew/test/test/custom_command_test.rb
+++ b/Library/Homebrew/test/test/custom_command_test.rb
--- a/Library/Homebrew/test/test/dependencies_test.rb
+++ b/Library/Homebrew/test/test/dependencies_test.rb
--- a/Library/Homebrew/test/test/dependency_collector_test.rb
+++ b/Library/Homebrew/test/test/dependency_collector_test.rb
--- a/Library/Homebrew/test/test/dependency_expansion_test.rb
+++ b/Library/Homebrew/test/test/dependency_expansion_test.rb
--- a/Library/Homebrew/test/test/dependency_test.rb
+++ b/Library/Homebrew/test/test/dependency_test.rb
--- a/Library/Homebrew/test/test/deps_test.rb
+++ b/Library/Homebrew/test/test/deps_test.rb
--- a/Library/Homebrew/test/test/desc_test.rb
+++ b/Library/Homebrew/test/test/desc_test.rb
--- a/Library/Homebrew/test/test/descriptions_test.rb
+++ b/Library/Homebrew/test/test/descriptions_test.rb
--- a/Library/Homebrew/test/test/diagnostic_test.rb
+++ b/Library/Homebrew/test/test/diagnostic_test.rb
--- a/Library/Homebrew/test/test/doctor_test.rb
+++ b/Library/Homebrew/test/test/doctor_test.rb
--- a/Library/Homebrew/test/test/download_strategies_test.rb
+++ b/Library/Homebrew/test/test/download_strategies_test.rb
--- a/Library/Homebrew/test/test/edit_test.rb
+++ b/Library/Homebrew/test/test/edit_test.rb
--- a/Library/Homebrew/test/test/exceptions_test.rb
+++ b/Library/Homebrew/test/test/exceptions_test.rb
--- a/Library/Homebrew/test/test/fetch_test.rb
+++ b/Library/Homebrew/test/test/fetch_test.rb
--- a/Library/Homebrew/test/test/formula_installer_bottle_test.rb
+++ b/Library/Homebrew/test/test/formula_installer_bottle_test.rb
--- a/Library/Homebrew/test/test/formula_installer_test.rb
+++ b/Library/Homebrew/test/test/formula_installer_test.rb
--- a/Library/Homebrew/test/test/formula_lock_test.rb
+++ b/Library/Homebrew/test/test/formula_lock_test.rb
--- a/Library/Homebrew/test/test/formula_pin_test.rb
+++ b/Library/Homebrew/test/test/formula_pin_test.rb
--- a/Library/Homebrew/test/test/formula_spec_selection_test.rb
+++ b/Library/Homebrew/test/test/formula_spec_selection_test.rb
--- a/Library/Homebrew/test/test/formula_support_test.rb
+++ b/Library/Homebrew/test/test/formula_support_test.rb
--- a/Library/Homebrew/test/test/formula_test.rb
+++ b/Library/Homebrew/test/test/formula_test.rb
--- a/Library/Homebrew/test/test/formula_validation_test.rb
+++ b/Library/Homebrew/test/test/formula_validation_test.rb
--- a/Library/Homebrew/test/test/formulary_test.rb
+++ b/Library/Homebrew/test/test/formulary_test.rb
--- a/Library/Homebrew/test/test/gpg2_requirement_test.rb
+++ b/Library/Homebrew/test/test/gpg2_requirement_test.rb
--- a/Library/Homebrew/test/test/gpg_test.rb
+++ b/Library/Homebrew/test/test/gpg_test.rb
--- a/Library/Homebrew/test/test/hardware_test.rb
+++ b/Library/Homebrew/test/test/hardware_test.rb
--- a/Library/Homebrew/test/test/help_test.rb
+++ b/Library/Homebrew/test/test/help_test.rb
--- a/Library/Homebrew/test/test/home_test.rb
+++ b/Library/Homebrew/test/test/home_test.rb
--- a/Library/Homebrew/test/test/info_test.rb
+++ b/Library/Homebrew/test/test/info_test.rb
--- a/Library/Homebrew/test/test/inreplace_test.rb
+++ b/Library/Homebrew/test/test/inreplace_test.rb
--- a/Library/Homebrew/test/test/install_test.rb
+++ b/Library/Homebrew/test/test/install_test.rb
--- a/Library/Homebrew/test/test/irb_test.rb
+++ b/Library/Homebrew/test/test/irb_test.rb
--- a/Library/Homebrew/test/test/json_test.rb
+++ b/Library/Homebrew/test/test/json_test.rb
--- a/Library/Homebrew/test/test/keg_test.rb
+++ b/Library/Homebrew/test/test/keg_test.rb
--- a/Library/Homebrew/test/test/language_go_test.rb
+++ b/Library/Homebrew/test/test/language_go_test.rb
--- a/Library/Homebrew/test/test/language_module_requirement_test.rb
+++ b/Library/Homebrew/test/test/language_module_requirement_test.rb
--- a/Library/Homebrew/test/test/language_python_test.rb
+++ b/Library/Homebrew/test/test/language_python_test.rb
--- a/Library/Homebrew/test/test/leaves_test.rb
+++ b/Library/Homebrew/test/test/leaves_test.rb
--- a/Library/Homebrew/test/test/link_test.rb
+++ b/Library/Homebrew/test/test/link_test.rb
--- a/Library/Homebrew/test/test/linkapps_test.rb
+++ b/Library/Homebrew/test/test/linkapps_test.rb
--- a/Library/Homebrew/test/test/list_test.rb
+++ b/Library/Homebrew/test/test/list_test.rb
--- a/Library/Homebrew/test/test/log_formula_test.rb
+++ b/Library/Homebrew/test/test/log_formula_test.rb
--- a/Library/Homebrew/test/test/log_test.rb
+++ b/Library/Homebrew/test/test/log_test.rb
--- a/Library/Homebrew/test/test/migrate_test.rb
+++ b/Library/Homebrew/test/test/migrate_test.rb
--- a/Library/Homebrew/test/test/migrator_test.rb
+++ b/Library/Homebrew/test/test/migrator_test.rb
--- a/Library/Homebrew/test/test/missing_test.rb
+++ b/Library/Homebrew/test/test/missing_test.rb
--- a/Library/Homebrew/test/test/mpi_requirement_test.rb
+++ b/Library/Homebrew/test/test/mpi_requirement_test.rb
--- a/Library/Homebrew/test/test/options_test.rb
+++ b/Library/Homebrew/test/test/options_test.rb
--- a/Library/Homebrew/test/test/os/mac/blacklist_test.rb
+++ b/Library/Homebrew/test/test/os/mac/blacklist_test.rb
--- a/Library/Homebrew/test/test/os/mac/bottle_collector_test.rb
+++ b/Library/Homebrew/test/test/os/mac/bottle_collector_test.rb
--- a/Library/Homebrew/test/test/os/mac/bottle_tag_test.rb
+++ b/Library/Homebrew/test/test/os/mac/bottle_tag_test.rb
--- a/Library/Homebrew/test/test/os/mac/dependency_collector_test.rb
+++ b/Library/Homebrew/test/test/os/mac/dependency_collector_test.rb
--- a/Library/Homebrew/test/test/os/mac/diagnostic_test.rb
+++ b/Library/Homebrew/test/test/os/mac/diagnostic_test.rb
--- a/Library/Homebrew/test/test/os/mac/keg_test.rb
+++ b/Library/Homebrew/test/test/os/mac/keg_test.rb
--- a/Library/Homebrew/test/test/os/mac/language_test.rb
+++ b/Library/Homebrew/test/test/os/mac/language_test.rb
--- a/Library/Homebrew/test/test/os/mac/mach_test.rb
+++ b/Library/Homebrew/test/test/os/mac/mach_test.rb
--- a/Library/Homebrew/test/test/os/mac/version_test.rb
+++ b/Library/Homebrew/test/test/os/mac/version_test.rb
--- a/Library/Homebrew/test/test/os/mac/x11_requirement_test.rb
+++ b/Library/Homebrew/test/test/os/mac/x11_requirement_test.rb
--- a/Library/Homebrew/test/test/outdated_test.rb
+++ b/Library/Homebrew/test/test/outdated_test.rb
--- a/Library/Homebrew/test/test/patch_test.rb
+++ b/Library/Homebrew/test/test/patch_test.rb
--- a/Library/Homebrew/test/test/patching_test.rb
+++ b/Library/Homebrew/test/test/patching_test.rb
--- a/Library/Homebrew/test/test/pathname_test.rb
+++ b/Library/Homebrew/test/test/pathname_test.rb
--- a/Library/Homebrew/test/test/pin_unpin_test.rb
+++ b/Library/Homebrew/test/test/pin_unpin_test.rb
--- a/Library/Homebrew/test/test/pkg_version_test.rb
+++ b/Library/Homebrew/test/test/pkg_version_test.rb
--- a/Library/Homebrew/test/test/prefix_formula_test.rb
+++ b/Library/Homebrew/test/test/prefix_formula_test.rb
--- a/Library/Homebrew/test/test/prefix_test.rb
+++ b/Library/Homebrew/test/test/prefix_test.rb
--- a/Library/Homebrew/test/test/prune_test.rb
+++ b/Library/Homebrew/test/test/prune_test.rb
--- a/Library/Homebrew/test/test/pull_offline_test.rb
+++ b/Library/Homebrew/test/test/pull_offline_test.rb
--- a/Library/Homebrew/test/test/pull_test.rb
+++ b/Library/Homebrew/test/test/pull_test.rb
--- a/Show More
+++ b/Show More