summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2014-08-26 17:03:55 +0200
committergebele <gebele@in-silico.ch>2014-08-26 17:03:55 +0200
commit1950d60663f1839fca53473f2c3b45fe72a8267d (patch)
tree4724674e2f6786d9fa7bd9c4bab545b9c1ffd6e3
parent09f3bf09e5262191ff33d96471fe706e069c41db (diff)
parent7d907246a1277545b0aa910713dc24e94fccefc7 (diff)
Merge branch 'development' of github.com:opentox/opentox-test into development
-rw-r--r--opentox-client-all.rb4
-rw-r--r--opentox-client-short.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/opentox-client-all.rb b/opentox-client-all.rb
index 5343820..289b07a 100644
--- a/opentox-client-all.rb
+++ b/opentox-client-all.rb
@@ -2,7 +2,9 @@ require 'minitest/autorun'
require 'openbabel'
all = Dir["test/*.rb"]
exclude = [
- "test/*setup.rb",
"test/lazarweb.rb",
+ "test/*setup.rb",
+ "test/aop-curl.rb",
+ "test/aopweb.rb",
] + Dir["test/toxbank*.rb"]
(all - exclude).each {|f| require_relative f }
diff --git a/opentox-client-short.rb b/opentox-client-short.rb
index e89ce5c..70c68ef 100644
--- a/opentox-client-short.rb
+++ b/opentox-client-short.rb
@@ -2,7 +2,9 @@ require 'minitest/autorun'
require 'openbabel'
all = Dir["test/*.rb"]
exclude = [
- "test/*setup.rb",
"test/lazarweb.rb",
+ "test/*setup.rb",
+ "test/aop-curl.rb",
+ "test/aopweb.rb",
] + Dir["test/toxbank*.rb"] + Dir["test/*long.rb"]
(all - exclude).each {|f| require_relative f }