summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rw-r--r--doc/mrbgems/README.md5
-rw-r--r--mrbgems/mruby-fiber/test/fiber.rb10
3 files changed, 12 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 48da43be4..b00a5db7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
# no installation...
+install:
+ - sudo apt-get -q install gperf
+
env: MRUBY_CONFIG=travis_config.rb
script: "./minirake all test"
diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md
index 03543276f..e89fd1a56 100644
--- a/doc/mrbgems/README.md
+++ b/doc/mrbgems/README.md
@@ -57,6 +57,11 @@ the build block:
This will cause the *custom* GemBox to be read in during the build process,
adding *mruby-time* and *mrbgems-example* to the build.
+If you want, you can put GemBox outside of mruby directory. In that case you must
+specify absolute path like below.
+
+ conf.gembox "#{ENV["HOME"]}/mygemboxes/custom"
+
There are two GemBoxes that ship with mruby: [default](../../mrbgems/default.gembox)
and [full-core](../../mrbgems/full-core.gembox). The [default](../../mrbgems/default.gembox) GemBox
contains several core components of mruby, and [full-core](../../mrbgems/full-core.gembox)
diff --git a/mrbgems/mruby-fiber/test/fiber.rb b/mrbgems/mruby-fiber/test/fiber.rb
index 90bbaa2af..8caf7259b 100644
--- a/mrbgems/mruby-fiber/test/fiber.rb
+++ b/mrbgems/mruby-fiber/test/fiber.rb
@@ -42,25 +42,23 @@ assert('Fiber with splat in the block argument list') {
}
assert('Fiber raises on resume when dead') {
- e2 = nil
r1 = true
begin
f = Fiber.new{}
f.resume
r1 = f.alive?
f.resume
+ false
rescue => e1
- e2 = e1
+ true
end
- r1 == false and e2.class == RuntimeError
}
assert('Yield raises when called on root fiber') {
- e2 = nil
begin
Fiber.yield
+ false
rescue => e1
- e2 = e1
+ true
end
- e2.class == ArgumentError
}