From 8d3d15af637551a921a62aac83e6e056fd0656d9 Mon Sep 17 00:00:00 2001
From: Dan Vanderkam <dan@dygraphs.com>
Date: Tue, 7 Jun 2011 00:36:17 -0400
Subject: [PATCH] tests pass
---
auto_tests/misc/local.html | 5 +----
dygraph-dev.js | 1 +
generate-combined.sh | 1 +
jsTestDriver.conf | 15 ++++++++++++---
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html
index 57764b1..a451f8e 100644
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@ -6,10 +6,7 @@
<!--[if IE]>
<script type="text/javascript" src="../../excanvas.js"></script>
<![endif]-->
- <script type="text/javascript" src="../../strftime/strftime-min.js"></script>
- <script type="text/javascript" src="../../rgbcolor/rgbcolor.js"></script>
- <script type="text/javascript" src="../../dygraph-canvas.js"></script>
- <script type="text/javascript" src="../../dygraph.js"></script>
+ <script type="text/javascript" src="../../dygraph-dev.js"></script>
<!-- Scripts for automated tests -->
<script type="text/javascript" src="../lib/jquery-1.4.2.js"></script>
diff --git a/dygraph-dev.js b/dygraph-dev.js
index 3959863..1e7bada 100644
--- a/dygraph-dev.js
+++ b/dygraph-dev.js
@@ -13,6 +13,7 @@
var path = m[1]; // captured group, not the full match.
// This list needs to be kept in sync w/ the one in generate-combined.sh
+ // and the one in jsTestDriver.conf.
var source_files = [
"strftime/strftime-min.js",
"rgbcolor/rgbcolor.js",
diff --git a/generate-combined.sh b/generate-combined.sh
index 4a3c920..d38772c 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -4,6 +4,7 @@
# Pack all the JS together.
# This list needs to be kept in sync w/ the one in dygraph-dev.js
+# and the one in jsTestDriver.conf.
cat \
dygraph-layout.js \
dygraph-canvas.js \
diff --git a/jsTestDriver.conf b/jsTestDriver.conf
index a566e8f..d6c2479 100644
--- a/jsTestDriver.conf
+++ b/jsTestDriver.conf
@@ -1,8 +1,17 @@
server: http://localhost:9876
+# This list needs to be kept in sync w/ the one in dygraph-dev.js
+# and the one in generate-combined.sh.
load:
- - dygraph.js
- - dygraph-canvas.js
- - rgbcolor/rgbcolor.js
- strftime/strftime-min.js
+ - rgbcolor/rgbcolor.js
+ - dygraph-layout.js
+ - dygraph-canvas.js
+ - dygraph.js
+ - dygraph-utils.js
+ - dygraph-gviz.js
+ - dygraph-interaction-model.js
+ - dygraph-options-reference.js
+ - dygraph-dev.js
+ - excanvas.js
- auto_tests/tests/*.js
--
2.7.4