From de4b5eeda79fe0ead918ea51c5c4d480b8c9f953 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Wed, 24 Apr 2013 09:08:46 -0700
Subject: [PATCH] Allow external scripts to be specified and run in the perf
 suite.

Former-commit-id: 474f0a24d54c800830e2bcec98f6536a17a12bfb
---
 perf/index.html |  4 ++--
 perf/perf-ui.js | 39 +++++++++++++++++++++++++--------------
 perf/perf.js    | 13 +++++++++----
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/perf/index.html b/perf/index.html
index 47443078c..554895c47 100644
--- a/perf/index.html
+++ b/perf/index.html
@@ -34,13 +34,13 @@
 		<script src="../vendor/firebug-lite/src/firebug-lite-debug.js"></script>
 		<script src="perf-ui.js"></script>
 		<script>
-			document.write('<script src="../' + ui.buildPath + '"><\/script>');
+			document.write('<script src="' + ui.buildPath + '"><\/script>');
 		</script>
 		<script>
 			var lodash = _.noConflict();
 		</script>
 		<script>
-			document.write('<script src="../' + ui.otherPath + '"><\/script>');
+			document.write('<script src="' + ui.otherPath + '"><\/script>');
 		</script>
 		<script src="perf.js"></script>
 		<script>
diff --git a/perf/perf-ui.js b/perf/perf-ui.js
index da0146210..9d38eb3c8 100644
--- a/perf/perf-ui.js
+++ b/perf/perf-ui.js
@@ -1,6 +1,9 @@
 ;(function(window) {
   'use strict';
 
+  /** The base path of the builds */
+  var basePath = '../';
+
   /** The Lo-Dash build to load */
   var build = (/build=([^&]+)/.exec(location.search) || [])[1];
 
@@ -33,28 +36,36 @@
 
   // expose Lo-Dash build file path
   ui.buildPath = (function() {
+    var result;
     switch (build) {
-      case 'lodash-compat':     return 'dist/lodash.compat.min.js';
-      case 'lodash-mobile':     return 'dist/lodash.mobile.min.js';
-      case 'lodash-underscore': return 'dist/lodash.underscore.min.js';
-      case 'lodash-custom-dev': return 'lodash.custom.js';
-      case 'lodash-custom':     return 'lodash.custom.min.js';
+      case 'lodash-compat':     result = 'dist/lodash.compat.min.js'; break;
+      case 'lodash-mobile':     result = 'dist/lodash.mobile.min.js'; break;
+      case 'lodash-underscore': result = 'dist/lodash.underscore.min.js'; break;
+      case 'lodash-custom-dev': result = 'lodash.custom.js'; break;
+      case 'lodash-custom':     result = 'lodash.custom.min.js'; break;
+      case 'lodash-modern':
+      case  undefined:          result = 'dist/lodash.min.js'; break;
+      default:                  result = build;
     }
-    return 'dist/lodash.min.js';
+    return result == build ? result : (basePath + result);
   }());
 
   // expose other library file path
   ui.otherPath = (function() {
+    var result;
     switch (other) {
-      case 'lodash-compat':     return 'dist/lodash.compat.min.js';
-      case 'lodash-mobile':     return 'dist/lodash.mobile.min.js';
-      case 'lodash-modern':     return 'dist/lodash.min.js';
-      case 'lodash-underscore': return 'dist/lodash.underscore.min.js';
-      case 'lodash-custom-dev': return 'lodash.custom.js';
-      case 'lodash-custom':     return 'lodash.custom.min.js';
-      case 'underscore-dev':    return 'vendor/underscore/underscore.js';
+      case 'lodash-compat':     result = 'dist/lodash.compat.min.js'; break;
+      case 'lodash-mobile':     result = 'dist/lodash.mobile.min.js'; break;
+      case 'lodash-modern':     result = 'dist/lodash.min.js'; break;
+      case 'lodash-underscore': result = 'dist/lodash.underscore.min.js'; break;
+      case 'lodash-custom-dev': result = 'lodash.custom.js'; break;
+      case 'lodash-custom':     result = 'lodash.custom.min.js'; break;
+      case 'underscore-dev':    result = 'vendor/underscore/underscore.js'; break;
+      case 'underscore':
+      case  undefined:          result = 'vendor/underscore/underscore-min.js'; break;
+      default:                  result = other;
     }
-    return 'vendor/underscore/underscore-min.js';
+    return result == other ? result : (basePath + result);
   }());
 
   // initialize controls
diff --git a/perf/perf.js b/perf/perf.js
index 5e827dc21..bb58d45db 100644
--- a/perf/perf.js
+++ b/perf/perf.js
@@ -192,10 +192,12 @@
         var bench = this[index];
         if (bench.error) {
           var errored = true;
-          log(bench.error);
         }
       }
-      if (!errored) {
+      if (errored) {
+        log('There was a problem, skipping...');
+      }
+      else {
         var formatNumber = Benchmark.formatNumber,
             fastest = this.filter('fastest'),
             fastestHz = getHz(fastest[0]),
@@ -290,8 +292,11 @@
       \
       if (typeof bindAll != "undefined") {\
         var bindAllCount = -1,\
-            bindAllObjects = Array(this.count),\
-            funcNames = belt.functions(belt).slice(0, 40);\
+            bindAllObjects = Array(this.count);\
+        \
+        var funcNames = belt.reject(belt.functions(belt).slice(0, 40), function(funcName) {\
+          return /^_/.test(funcName);\
+        });\
         \
         // potentially expensive\n\
         for (index = 0; index < this.count; index++) {\