Permalink
Browse files

Do not build almond in the test files, I keep forgetting to run the b…

…uildTest.sh script to generate them.
  • Loading branch information...
1 parent fbddfe2 commit 04d6d567b9517d66ec8468cce7b03b66c6dbd5aa @jrburke jrburke committed Oct 3, 2012
View
@@ -1,12 +1 @@
.DS_Store
-tests/simple-built.js
-tests/moduleConfig/moduleConfig-built.js
-tests/mapConfig/mapConfig-built.js
-tests/mapConfig/mapConfigStar-built.js
-tests/mapConfig/mapConfigStarAdapter-built.js
-tests/mapConfig/mapConfigSpecificity-built.js
-tests/plugins/plugins-built.js
-tests/plugins/coffee-built.js
-tests/plugins/text-built.js
-tests/shim/shim-built.js
-tests/plugins/order/order-built.js
View
@@ -1,33 +0,0 @@
-#!/bin/bash
-cat almond.js > tests/simple-built.js
-cat tests/simple.js >> tests/simple-built.js
-
-cat almond.js > tests/moduleConfig/moduleConfig-built.js
-cat tests/moduleConfig/moduleConfig.js >> tests/moduleConfig/moduleConfig-built.js
-
-cat almond.js > tests/mapConfig/mapConfig-built.js
-cat tests/mapConfig/mapConfig.js >> tests/mapConfig/mapConfig-built.js
-
-cat almond.js > tests/mapConfig/mapConfigStar-built.js
-cat tests/mapConfig/mapConfigStar.js >> tests/mapConfig/mapConfigStar-built.js
-
-cat almond.js > tests/mapConfig/mapConfigSpecificity-built.js
-cat tests/mapConfig/mapConfigSpecificity.js >> tests/mapConfig/mapConfigSpecificity-built.js
-
-cat almond.js > tests/mapConfig/mapConfigStarAdapter-built.js
-cat tests/mapConfig/mapConfigStarAdapter.js >> tests/mapConfig/mapConfigStarAdapter-built.js
-
-cat almond.js > tests/plugins/plugins-built.js
-cat tests/plugins/plugins.js >> tests/plugins/plugins-built.js
-
-cat almond.js > tests/plugins/coffee-built.js
-cat tests/plugins/coffee.js >> tests/plugins/coffee-built.js
-
-cat almond.js > tests/plugins/text-built.js
-cat tests/plugins/text.js >> tests/plugins/text-built.js
-
-cat almond.js > tests/shim/shim-built.js
-cat tests/shim/shim.js >> tests/shim/shim-built.js
-
-
-node ../r.js/r.js -o baseUrl=tests/plugins/order include=../../../almond,order\!one,order\!two out=tests/plugins/order/order-built.js optimize=none
@@ -4,7 +4,8 @@
<title>require.js: Map Config Test</title>
<script type="text/javascript" src="../doh/runner.js"></script>
<script type="text/javascript" src="../doh/_browserRunner.js"></script>
- <script type="text/javascript" src="mapConfig-built.js"></script>
+ <script src="../../almond.js"></script>
+ <script type="text/javascript" src="mapConfig.js"></script>
</head>
<body>
<h1>require.js: Map Config Test</h1>
@@ -4,7 +4,8 @@
<title>require.js: Map Config Specificity Test</title>
<script type="text/javascript" src="../doh/runner.js"></script>
<script type="text/javascript" src="../doh/_browserRunner.js"></script>
- <script type="text/javascript" src="mapConfigSpecificity-built.js"></script>
+ <script src="../../almond.js"></script>
+ <script type="text/javascript" src="mapConfigSpecificity.js"></script>
</head>
<body>
<h1>require.js: Map Config Specificity Test</h1>
@@ -4,7 +4,8 @@
<title>require.js: Map Config Star Test</title>
<script type="text/javascript" src="../doh/runner.js"></script>
<script type="text/javascript" src="../doh/_browserRunner.js"></script>
- <script type="text/javascript" src="mapConfigStar-built.js"></script>
+ <script src="../../almond.js"></script>
+ <script type="text/javascript" src="mapConfigStar.js"></script>
</head>
<body>
<h1>require.js: Map Config Star Test</h1>
@@ -4,7 +4,8 @@
<title>require.js: Map Config Star Adapter Built Test</title>
<script type="text/javascript" src="../doh/runner.js"></script>
<script type="text/javascript" src="../doh/_browserRunner.js"></script>
- <script type="text/javascript" src="mapConfigStarAdapter-built.js"></script>
+ <script src="../../almond.js"></script>
+ <script type="text/javascript" src="mapConfigStarAdapter.js"></script>
</head>
<body>
<h1>require.js: Map Config Star Adapter Built Test</h1>
@@ -4,7 +4,8 @@
<title>almond: moduleConfig Test</title>
<script type="text/javascript" src="../doh/runner.js"></script>
<script type="text/javascript" src="../doh/_browserRunner.js"></script>
- <script type="text/javascript" src="moduleConfig-built.js"></script>
+ <script src="../../almond.js"></script>
+ <script type="text/javascript" src="moduleConfig.js"></script>
<script type="text/javascript">
var master = new doh.Deferred();
@@ -4,7 +4,8 @@
<title>almond: Coffee Test</title>
<script type="text/javascript" src="../doh/runner.js"></script>
<script type="text/javascript" src="../doh/_browserRunner.js"></script>
- <script type="text/javascript" src="coffee-built.js"></script>
+ <script src="../../almond.js"></script>
+ <script type="text/javascript" src="coffee.js"></script>
<script type="text/javascript">
require(["cs!csmain"],
function(csmain) {
@@ -1,3 +0,0 @@
-var one = {
- name: 'one'
-};
Oops, something went wrong.

0 comments on commit 04d6d56

Please sign in to comment.