Changeset 227
- Timestamp:
- 08/07/06 09:16:37 (2 years ago)
- Files:
-
- version_0/ext/rubymain.cpp (modified) (2 diffs)
- version_0/lib/eventmachine.rb (modified) (2 diffs)
- version_0/Rakefile (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
version_0/ext/rubymain.cpp
r215 r227 213 213 evma_signal_loopbreak(); 214 214 return Qnil; 215 } 216 217 /************** 218 t_library_type 219 **************/ 220 221 static VALUE t_library_type (VALUE self) 222 { 223 return rb_eval_string (":extension"); 215 224 } 216 225 … … 241 250 rb_define_module_function (EmModule, "stop", (VALUE(*)(...))t_stop, 0); 242 251 rb_define_module_function (EmModule, "signal_loopbreak", (VALUE(*)(...))t_signal_loopbreak, 0); 252 rb_define_module_function (EmModule, "library_type", (VALUE(*)(...))t_library_type, 0); 243 253 244 254 rb_define_module_function (EmModule, "get_peername", (VALUE(*)(...))t_get_peername, 1); version_0/lib/eventmachine.rb
r222 r227 35 35 # 36 36 37 require 'rubyeventmachine' 37 38 #-- Select in a library based on a global variable. 39 case $eventmachine_library 40 when :pure_ruby 41 require 'pr_eventmachine' 42 when :extension 43 require 'rubyeventmachine' 44 else 45 # This is the case that most user code will take. 46 # Prefer the extension is available. 47 begin 48 require 'rubyeventmachine' 49 rescue LoadError 50 require 'pr_eventmachine' 51 end 52 end 53 54 55 require "eventmachine_version" 38 56 require 'em/deferrable' 39 57 #-- Additional requires are at the BOTTOM of this file, because they 40 58 #-- depend on stuff defined in here. Refactor that someday. 59 41 60 42 61 … … 137 156 module EventMachine 138 157 139 VERSION = "0.7.0"140 158 141 159 # EventMachine::run initializes and runs an event loop. version_0/Rakefile
r213 r227 25 25 26 26 $: << "lib" 27 require 'eventmachine '27 require 'eventmachine_version' 28 28 $version = EventMachine::VERSION 29 29 $distdir = "eventmachine-#$version" … … 106 106 end 107 107 108 desc "Run the tests for #$name." 109 task :test do |t| 108 109 110 # This is used by three rake tasks, that parameterize the 111 # behavior with a global variable. This way we can test 112 # the extension and non-extension versions with the same tests. 113 test_runner = proc {|t, libr| 110 114 require 'test/unit/testsuite' 111 115 require 'test/unit/ui/console/testrunner' … … 113 117 runner = Test::Unit::UI::Console::TestRunner 114 118 119 $eventmachine_library = libr 115 120 $LOAD_PATH.unshift('tests') 116 121 $stderr.puts "Checking for test cases:" if t.verbose 117 Dir['tests/t c_*.rb'].each do |testcase|122 Dir['tests/test_*.rb'].each do |testcase| 118 123 $stderr.puts "\t#{testcase}" if t.verbose 119 124 load testcase … … 127 132 128 133 runner.run(suite) 134 } 135 136 desc "Run tests for #$name." 137 task :test do |t| 138 test_runner.call t, nil 139 end 140 141 desc "Run pure-ruby tests for #$name." 142 task :testpr do |t| 143 test_runner.call t, :pure_ruby 144 end 145 146 desc "Run extension tests for #$name." 147 task :testext do |t| 148 test_runner.call t, :extension 129 149 end 130 150