cvs: clean up test

1 files changed, 4 insertions, 6 deletions

diff --git a/Library/Formula/cvs.rb b/Library/Formula/cvs.rb
index 3f7685b8a..116c5b790 100644
--- a/Library/Formula/cvs.rb
+++ b/Library/Formula/cvs.rb
@@ -50,15 +50,13 @@ class Cvs < Formula
   end
 
   test do
-    system "mkdir", "cvsroot"
-
-    cvsroot = %x[echo ${PWD}/cvsroot].chomp
-
+    cvsroot = testpath/"cvsroot"
+    cvsroot.mkpath
     system "#{bin}/cvs", "-d", cvsroot, "init"
 
     mkdir "cvsexample" do
-      ENV['CVSROOT'] = "#{cvsroot}"
-      system "#{bin}/cvs", "import", "-m ", "'dir structure'", "cvsexample", "homebrew", "start"
+      ENV["CVSROOT"] = cvsroot
+      system "#{bin}/cvs", "import", "-m", "dir structure", "cvsexample", "homebrew", "start"
     end
   end
 end