summaryrefslogtreecommitdiffstats
path: root/install.rb
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-05-27 14:10:40 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-05-27 14:10:40 +1000
commitad3803ff6ff439568eaa7763c008d6c24c8b0ed8 (patch)
tree3afc9e6c9675223cf11721c3f3b3e9461807ae61 /install.rb
parent3d51a287e8d81e526e48a0040475ef2753ea6bab (diff)
downloadpuppet-ad3803ff6ff439568eaa7763c008d6c24c8b0ed8.tar.gz
puppet-ad3803ff6ff439568eaa7763c008d6c24c8b0ed8.tar.xz
puppet-ad3803ff6ff439568eaa7763c008d6c24c8b0ed8.zip
Fixes for install.rb running of tests that fixes #1267
Diffstat (limited to 'install.rb')
-rwxr-xr-xinstall.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/install.rb b/install.rb
index 207f74a0b..66494a244 100755
--- a/install.rb
+++ b/install.rb
@@ -78,7 +78,7 @@ rdoc = glob(%w{bin/* sbin/* lib/**/*.rb README README-library CHANGELOG TODO In
ri = glob(%w(bin/*.rb sbin/* lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
man = glob(%w{man/man8/*})
libs = glob(%w{lib/**/*.rb lib/**/*.py})
-tests = glob(%w{tests/**/*.rb})
+tests = glob(%w{test/**/*.rb})
def do_bins(bins, target, strip = 's?bin/')
bins.each do |bf|
@@ -383,7 +383,7 @@ EOS
check_prereqs
prepare_installation
-run_tests(tests) if InstallOptions.tests
+#run_tests(tests) if InstallOptions.tests
#build_rdoc(rdoc) if InstallOptions.rdoc
#build_ri(ri) if InstallOptions.ri
#build_man(bins) if InstallOptions.man