From 6d1c6dfd16fdc35efd455ff9cca3339298c39a3b Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Fri, 8 Feb 2013 00:58:26 -0800
Subject: [PATCH] Update test and perf scripts.

Former-commit-id: 434935e332ec03dfd370efcd191b3f9aff5a9387
---
 .travis.yml      |  4 ++--
 package.json     |  2 +-
 perf/perf-ui.js  | 34 ++++++++++++++++++++--------------
 perf/perf.js     |  2 +-
 test/run-test.sh |  7 +++++--
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 661e03c88..4bdd2ad2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ node_js:
   - 0.6
   - 0.9
 env:
-  - TEST_COMMAND="node ./test/test.js"
-  - TEST_COMMAND="node ./test/test.js ./lodash.min.js"
+  - TEST_COMMAND="node ./test/test.js ./dist/lodash.js"
+  - TEST_COMMAND="node ./test/test.js ./dist/lodash.min.js"
   - TEST_COMMAND="node ./test/test-build.js --time-limit 49m45s"
 git:
   depth: 1
diff --git a/package.json b/package.json
index e5853253c..7d648c4b6 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "rhino"
   ],
   "jam": {
-    "main": "./lodash.js"
+    "main": "./dist/lodash.js"
   },
   "scripts": {
     "build": "node ./build.js",
diff --git a/perf/perf-ui.js b/perf/perf-ui.js
index 5d3d9ed76..6855c861b 100644
--- a/perf/perf-ui.js
+++ b/perf/perf-ui.js
@@ -34,19 +34,21 @@
   // expose Lo-Dash build file path
   ui.buildPath = (function() {
     switch (build) {
-      case 'lodash-dev':        return 'lodash.js';
-      case 'lodash-underscore': return 'lodash.underscore.min.js';
+      case 'lodash-dev':        return 'dist/lodash.compat.js';
+      case 'lodash-modern':     return 'dist/lodash.min.js';
+      case 'lodash-underscore': return 'dist/lodash.underscore.min.js';
       case 'lodash-custom':     return 'lodash.custom.min.js';
     }
-    return 'lodash.min.js';
+    return 'dist/lodash.compat.min.js';
   }());
 
   // expose other library file path
   ui.otherPath = (function() {
     switch (other) {
-      case 'lodash-dev':        return 'lodash.js';
-      case 'lodash-prod':       return 'lodash.min.js';
-      case 'lodash-underscore': return 'lodash.underscore.min.js';
+      case 'lodash-dev':        return 'dist/lodash.compat.js';
+      case 'lodash-prod':       return 'dist/lodash.compat.min.js';
+      case 'lodash-modern':     return 'dist/lodash.min.js';
+      case 'lodash-underscore': return 'dist/lodash.underscore.min.js';
       case 'lodash-custom':     return 'lodash.custom.min.js';
       case 'underscore-dev':    return 'vendor/underscore/underscore.js';
     }
@@ -76,6 +78,7 @@
       '<select id="perf-build">' +
       '<option value="lodash-dev">Lo-Dash</option>' +
       '<option value="lodash-prod">Lo-Dash (minified)</option>' +
+      '<option value="lodash-modern">Lo-Dash (modern)</option>' +
       '<option value="lodash-underscore">Lo-Dash (underscore)</option>' +
       '<option value="lodash-custom">Lo-Dash (custom)</option>' +
       '</select>';
@@ -89,6 +92,7 @@
       '<option value="underscore-prod">Underscore (minified)</option>' +
       '<option value="lodash-dev">Lo-Dash</option>' +
       '<option value="lodash-prod">Lo-Dash (minified)</option>' +
+      '<option value="lodash-modern">Lo-Dash (modern)</option>' +
       '<option value="lodash-underscore">Lo-Dash (underscore)</option>' +
       '<option value="lodash-custom">Lo-Dash (custom)</option>' +
       '</select>';
@@ -102,20 +106,22 @@
 
     buildList.selectedIndex = (function() {
       switch (build) {
-        case 'lodash-dev':          return 0;
-        case 'lodash-underscore':   return 2;
-        case 'lodash-custom':       return 3;
+        case 'lodash-dev':        return 0;
+        case 'lodash-modern':     return 2;
+        case 'lodash-underscore': return 3;
+        case 'lodash-custom':     return 4;
       }
       return 1;
     }());
 
     otherList.selectedIndex = (function() {
       switch (other) {
-        case 'underscore-dev':      return 0;
-        case 'lodash-dev':          return 2;
-        case 'lodash-prod':         return 3;
-        case 'lodash-underscore':   return 4;
-        case 'lodash-custom':       return 5;
+        case 'underscore-dev':    return 0;
+        case 'lodash-dev':        return 2;
+        case 'lodash-prod':       return 3;
+        case 'lodash-modern':     return 4;
+        case 'lodash-underscore': return 5;
+        case 'lodash-custom':     return 6;
       }
       return 1;
     }());
diff --git a/perf/perf.js b/perf/perf.js
index ae7388cc3..769056774 100644
--- a/perf/perf.js
+++ b/perf/perf.js
@@ -13,7 +13,7 @@
   /** Load Lo-Dash */
   var lodash =
     window.lodash || (
-      lodash = load('../lodash.js') || window._,
+      lodash = load('../dist/lodash.js') || window._,
       lodash = lodash._ || lodash,
       lodash.noConflict()
     );
diff --git a/test/run-test.sh b/test/run-test.sh
index 06dd132ec..5e8962e12 100755
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -1,11 +1,14 @@
 cd "$(dirname "$0")"
-for cmd in rhino ringo narwhal node; do
+for cmd in rhino ringo narwhal; do
   echo ""
   echo "Testing in $cmd..."
-  $cmd test.js && $cmd test.js ../lodash.min.js
+  $cmd test.js ../dist/lodash.compat.js && $cmd test.js ../dist/lodash.compat.min.js
 done
 
 echo ""
+echo "Testing in node..."
+node test.js ../dist/lodash.js && node test.js ../dist/lodash.min.js
+
 echo "Testing build..."
 node test-build.js