summaryrefslogtreecommitdiffstats
path: root/test/util
diff options
context:
space:
mode:
Diffstat (limited to 'test/util')
-rwxr-xr-xtest/util/classgen.rb2
-rwxr-xr-xtest/util/execution.rb2
-rwxr-xr-xtest/util/fileparsing.rb2
-rwxr-xr-xtest/util/inifile.rb2
-rwxr-xr-xtest/util/instance_loader.rb2
-rwxr-xr-xtest/util/log.rb2
-rwxr-xr-xtest/util/metrics.rb2
-rwxr-xr-xtest/util/package.rb2
-rwxr-xr-xtest/util/pidlock.rb2
-rwxr-xr-xtest/util/settings.rb2
-rwxr-xr-xtest/util/storage.rb2
-rwxr-xr-xtest/util/subclass_loader.rb2
-rwxr-xr-xtest/util/utiltest.rb2
13 files changed, 13 insertions, 13 deletions
diff --git a/test/util/classgen.rb b/test/util/classgen.rb
index 5560764d5..aa9bdbed7 100755
--- a/test/util/classgen.rb
+++ b/test/util/classgen.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppet'
require 'puppettest'
diff --git a/test/util/execution.rb b/test/util/execution.rb
index e6509582e..316231b66 100755
--- a/test/util/execution.rb
+++ b/test/util/execution.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppet'
require 'puppettest'
diff --git a/test/util/fileparsing.rb b/test/util/fileparsing.rb
index 05ed80a79..831f19bdb 100755
--- a/test/util/fileparsing.rb
+++ b/test/util/fileparsing.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppettest'
require 'puppettest/fileparsing'
diff --git a/test/util/inifile.rb b/test/util/inifile.rb
index 78831ca2f..e3ce20823 100755
--- a/test/util/inifile.rb
+++ b/test/util/inifile.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppet'
require 'puppet/util/inifile'
diff --git a/test/util/instance_loader.rb b/test/util/instance_loader.rb
index 2e3dcb3d6..61ca4e3c8 100755
--- a/test/util/instance_loader.rb
+++ b/test/util/instance_loader.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppet'
require 'puppet/util/instance_loader'
diff --git a/test/util/log.rb b/test/util/log.rb
index 4dbd3c6d1..908347a50 100755
--- a/test/util/log.rb
+++ b/test/util/log.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppet'
require 'puppet/util/log'
diff --git a/test/util/metrics.rb b/test/util/metrics.rb
index 82e792d0b..d1a052293 100755
--- a/test/util/metrics.rb
+++ b/test/util/metrics.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppet'
require 'puppet/util/metric'
diff --git a/test/util/package.rb b/test/util/package.rb
index b2bb6dfcc..cd6a9d01d 100755
--- a/test/util/package.rb
+++ b/test/util/package.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppet'
require 'puppet/util/package'
diff --git a/test/util/pidlock.rb b/test/util/pidlock.rb
index 764c7436d..beaff1089 100755
--- a/test/util/pidlock.rb
+++ b/test/util/pidlock.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppet/util/pidlock'
require 'fileutils'
diff --git a/test/util/settings.rb b/test/util/settings.rb
index ffcfbbfc2..7a7150983 100755
--- a/test/util/settings.rb
+++ b/test/util/settings.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'mocha'
require 'puppettest'
diff --git a/test/util/storage.rb b/test/util/storage.rb
index f4836ce78..26bf70952 100755
--- a/test/util/storage.rb
+++ b/test/util/storage.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppet'
require 'puppettest'
diff --git a/test/util/subclass_loader.rb b/test/util/subclass_loader.rb
index 957b6cc6c..c3453157e 100755
--- a/test/util/subclass_loader.rb
+++ b/test/util/subclass_loader.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppettest'
require 'puppet/util/subclass_loader'
diff --git a/test/util/utiltest.rb b/test/util/utiltest.rb
index 0e55e1dde..1c934d612 100755
--- a/test/util/utiltest.rb
+++ b/test/util/utiltest.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
require 'puppettest'
require 'mocha'