Commits

Anonymous committed 8653540

Cleaning up Rakefile.
----------------
Cleaned up some test output
----------------
Added a new condition to the ignore files, since repo#init creates an Ampfile, the one created during tests should be ignored.

  • Participants
  • Parent commits 0b4ff95

Comments (0)

Files changed (4)

 ext/amp/*/*.bundle
 ext/amp/*/*.o
 ext/amp/*/Makefile
+test/localrepo_tests/Ampfile
 test/localrepo_tests/testrepo/
 test/merge_tests/local.txt.out
 test/store_tests/store/
 .idea/*
 .yardoc
 test/store_tests/store/*
+test/localrepo_tests/Ampfile
 test/localrepo_tests/testrepo/*
 test/localrepo_tests/.hg/*
 test/functional_tests/testrepo/*
   end
 end
  
-Hoe.plugin :minitest
+#Hoe.plugin :minitest
 Hoe.spec "amp" do
   developer "Michael Edgar", "adgar@carboni.ca"
   developer "Ari Brown", "seydar@carboni.ca"
 #   self.summary = "Version Control in Ruby. Mercurial Compatible. Big Ideas. (Pure-Ruby version)"
 # end
 
-
-
 remove_task 'test_deps', 'publish_docs', 'post_blog', 
             'deps:fetch', 'deps:list', 'deps:email', 'flay', 'clean', 'flog'
 
 task :build do
   curdir = File.expand_path(File.dirname(__FILE__))
   ruby_exe = RUBY_VERSION < "1.9" ? "ruby" : "ruby1.9"
-  Dir['ext/amp/*', 'ext/bz2'].each do |target|
+  Dir['ext/amp/*'].each do |target|
     sh "cd #{File.join(curdir, target)}; #{ruby_exe} #{File.join(curdir, target, "extconf.rb")}" # this is necessary because ruby will build the Makefile in '.'
     sh "cd #{File.join(curdir, target)}; make"
   end
 
 desc "Clean out the compiled code"
 task :clean do
-  sh "rm -rf ext/**/*.o"
-  sh "rm -rf ext/**/Makefile"
-  sh "rm -rf ext/**/*.bundle"
-  sh "rm -rf ext/**/*.so"
   sh "rm -rf ext/amp/**/*.o"
   sh "rm -rf ext/amp/**/Makefile"
   sh "rm -rf ext/amp/**/*.bundle"

File test/functional_tests/test_functional.rb

     
     # push our conflicting commit to testrepo from the "newrepo" child.
     push_results = amp "push"
-    p; puts push_results; p
     
     assert_match(/1 changeset/, push_results)
     assert_match(/3 changes/, push_results)