summaryrefslogtreecommitdiff
path: root/nightly
diff options
context:
space:
mode:
authorMartin Gütlein <martin.guetlein@gmail.com>2010-04-19 17:47:35 +0200
committerMartin Gütlein <martin.guetlein@gmail.com>2010-04-19 17:47:35 +0200
commit42e4bc9099d92b1fd0df6b6a979fbf4e1c662982 (patch)
tree9f7c6496ecdfcb21fa4f4ce48d97c76c5fa083b5 /nightly
parent0e017bd29cd27bc5f4588ed8d4b50f6706f3696b (diff)
fixes to build nightly with curl
Diffstat (limited to 'nightly')
-rw-r--r--nightly/nightly.rb6
-rw-r--r--nightly/nightly_application.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/nightly/nightly.rb b/nightly/nightly.rb
index de56d01..f28f3de 100644
--- a/nightly/nightly.rb
+++ b/nightly/nightly.rb
@@ -15,7 +15,7 @@ class Nightly
end
def self.build_nightly
- #OpenTox::Task.as_task do
+ OpenTox::Task.as_task do
LOGGER.info("Building nightly report.")
benchmarks = [ HamsterTrainingTestBenchmark.new, MiniRegressionBenchmark.new ]
@@ -72,13 +72,13 @@ class Nightly
Reports::ReportFormat.format_report_to_html(NIGHTLY_REP_DIR,
NIGHTLY_REPORT_XML,
NIGHTLY_REPORT_HTML,
- "http://opentox.informatik.uni-freiburg.de/simple_ot_stylesheet.css")
+ nil)
#"http://www.opentox.org/portal_css/Opentox%20Theme/base-cachekey7442.css")
#"http://apps.ideaconsult.net:8080/ToxPredict/style/global.css")
LOGGER.info("Nightly report completed")
return "Nightly report completed"
- #end
+ end
end
class ValidationBenchmark
diff --git a/nightly/nightly_application.rb b/nightly/nightly_application.rb
index c6fa887..35d4153 100644
--- a/nightly/nightly_application.rb
+++ b/nightly/nightly_application.rb
@@ -15,7 +15,7 @@ get '/nightly/?' do
content_type "text/html"
rep = Nightly.get_nightly
if rep.is_a?(File)
- result = body(File.new("/home/martin/software/sinatra/opentox-validation/nightly_report.html"))
+ result = body(rep)
else
result = rep
end