Browse code

Merge pull request #172 from jwforres/move_test_bindata

Move the test version of bindata.go underneath _output dir

Clayton Coleman authored on 2014/10/04 03:13:19
Showing 2 changed files
... ...
@@ -10,12 +10,8 @@ env:
10 10
 
11 11
 matrix:
12 12
   exclude:
13
-    - go: 1.3
14
-      env: TEST_ASSETS=false
15 13
     - go: 1.2
16 14
       env: TEST_ASSETS=true
17
-    - go: tip
18
-      env: TEST_ASSETS=true      
19 15
 
20 16
 before_install:
21 17
   - ./hack/before-install-assets.sh
... ...
@@ -19,9 +19,9 @@ pushd ${hackdir}/../ > /dev/null
19 19
   echo "Calculating asset checksums..."
20 20
   find assets/dist -type f | sort | xargs md5sum
21 21
 
22
-  Godeps/_workspace/bin/go-bindata -prefix "assets/dist" -pkg "assets" -o "test/assets/bindata.go" assets/dist/...
22
+  Godeps/_workspace/bin/go-bindata -prefix "assets/dist" -pkg "assets" -o "_output/test/assets/bindata.go" assets/dist/...
23 23
 
24 24
   echo "Validating checked in bindata.go is up to date..."
25 25
   # TODO remove the pipe to head as it messes up the exit code
26
-  diff test/assets/bindata.go pkg/assets/bindata.go
26
+  diff _output/test/assets/bindata.go pkg/assets/bindata.go
27 27
 popd > /dev/null
28 28
\ No newline at end of file