moved around tests

as per https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml github won't mark the project as "assembly" if they're in test/fixtures
mtolly · Oct 25, 2014 · 5e72e58 · 5e72e58
1 parent 476bc34
commit 5e72e58
Show file tree

Hide file tree

Showing 53 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,4 +8,4 @@ before_install:
   - cabal install alex happy
 
 script:
-  - cabal configure && cabal build && ./test.sh
+  - cabal configure && cabal build && test/run
diff --git a/test/.gitignore b/test/.gitignore
@@ -0,0 +1 @@
+*.mid
diff --git a/test/bikeriding.asm → test/fixtures/bikeriding.asm b/test/bikeriding.asm → test/fixtures/bikeriding.asm
diff --git a/test/celadon.asm → test/fixtures/celadon.asm b/test/celadon.asm → test/fixtures/celadon.asm
diff --git a/test/cinnabar.asm → test/fixtures/cinnabar.asm b/test/cinnabar.asm → test/fixtures/cinnabar.asm
diff --git a/test/cinnabarmansion.asm → test/fixtures/cinnabarmansion.asm b/test/cinnabarmansion.asm → test/fixtures/cinnabarmansion.asm
diff --git a/test/cities1.asm → test/fixtures/cities1.asm b/test/cities1.asm → test/fixtures/cities1.asm
diff --git a/test/cities2.asm → test/fixtures/cities2.asm b/test/cities2.asm → test/fixtures/cities2.asm
diff --git a/test/credits.asm → test/fixtures/credits.asm b/test/credits.asm → test/fixtures/credits.asm
diff --git a/test/defeatedgymleader.asm → test/fixtures/defeatedgymleader.asm b/test/defeatedgymleader.asm → test/fixtures/defeatedgymleader.asm
diff --git a/test/defeatedtrainer.asm → test/fixtures/defeatedtrainer.asm b/test/defeatedtrainer.asm → test/fixtures/defeatedtrainer.asm
diff --git a/test/defeatedwildmon.asm → test/fixtures/defeatedwildmon.asm b/test/defeatedwildmon.asm → test/fixtures/defeatedwildmon.asm
diff --git a/test/dungeon1.asm → test/fixtures/dungeon1.asm b/test/dungeon1.asm → test/fixtures/dungeon1.asm
diff --git a/test/dungeon2.asm → test/fixtures/dungeon2.asm b/test/dungeon2.asm → test/fixtures/dungeon2.asm
diff --git a/test/dungeon3.asm → test/fixtures/dungeon3.asm b/test/dungeon3.asm → test/fixtures/dungeon3.asm
diff --git a/test/finalbattle.asm → test/fixtures/finalbattle.asm b/test/finalbattle.asm → test/fixtures/finalbattle.asm
diff --git a/test/gamecorner.asm → test/fixtures/gamecorner.asm b/test/gamecorner.asm → test/fixtures/gamecorner.asm
diff --git a/test/gym.asm → test/fixtures/gym.asm b/test/gym.asm → test/fixtures/gym.asm
diff --git a/test/gymleaderbattle.asm → test/fixtures/gymleaderbattle.asm b/test/gymleaderbattle.asm → test/fixtures/gymleaderbattle.asm
diff --git a/test/halloffame.asm → test/fixtures/halloffame.asm b/test/halloffame.asm → test/fixtures/halloffame.asm
diff --git a/test/indigoplateau.asm → test/fixtures/indigoplateau.asm b/test/indigoplateau.asm → test/fixtures/indigoplateau.asm
diff --git a/test/introbattle.asm → test/fixtures/introbattle.asm b/test/introbattle.asm → test/fixtures/introbattle.asm
diff --git a/test/jigglypuffsong.asm → test/fixtures/jigglypuffsong.asm b/test/jigglypuffsong.asm → test/fixtures/jigglypuffsong.asm
diff --git a/test/lavender.asm → test/fixtures/lavender.asm b/test/lavender.asm → test/fixtures/lavender.asm
diff --git a/test/meeteviltrainer.asm → test/fixtures/meeteviltrainer.asm b/test/meeteviltrainer.asm → test/fixtures/meeteviltrainer.asm
diff --git a/test/meetfemaletrainer.asm → test/fixtures/meetfemaletrainer.asm b/test/meetfemaletrainer.asm → test/fixtures/meetfemaletrainer.asm
diff --git a/test/meetjessiejames.asm → test/fixtures/meetjessiejames.asm b/test/meetjessiejames.asm → test/fixtures/meetjessiejames.asm
diff --git a/test/meetmaletrainer.asm → test/fixtures/meetmaletrainer.asm b/test/meetmaletrainer.asm → test/fixtures/meetmaletrainer.asm
diff --git a/test/meetprofoak.asm → test/fixtures/meetprofoak.asm b/test/meetprofoak.asm → test/fixtures/meetprofoak.asm
diff --git a/test/meetrival.asm → test/fixtures/meetrival.asm b/test/meetrival.asm → test/fixtures/meetrival.asm
diff --git a/test/museumguy.asm → test/fixtures/museumguy.asm b/test/museumguy.asm → test/fixtures/museumguy.asm
diff --git a/test/oakslab.asm → test/fixtures/oakslab.asm b/test/oakslab.asm → test/fixtures/oakslab.asm
diff --git a/test/pallettown.asm → test/fixtures/pallettown.asm b/test/pallettown.asm → test/fixtures/pallettown.asm
diff --git a/test/pkmnhealed.asm → test/fixtures/pkmnhealed.asm b/test/pkmnhealed.asm → test/fixtures/pkmnhealed.asm
diff --git a/test/pokecenter.asm → test/fixtures/pokecenter.asm b/test/pokecenter.asm → test/fixtures/pokecenter.asm
diff --git a/test/pokemontower.asm → test/fixtures/pokemontower.asm b/test/pokemontower.asm → test/fixtures/pokemontower.asm
diff --git a/test/routes1.asm → test/fixtures/routes1.asm b/test/routes1.asm → test/fixtures/routes1.asm
diff --git a/test/routes2.asm → test/fixtures/routes2.asm b/test/routes2.asm → test/fixtures/routes2.asm
diff --git a/test/routes3.asm → test/fixtures/routes3.asm b/test/routes3.asm → test/fixtures/routes3.asm
diff --git a/test/routes4.asm → test/fixtures/routes4.asm b/test/routes4.asm → test/fixtures/routes4.asm
diff --git a/test/safarizone.asm → test/fixtures/safarizone.asm b/test/safarizone.asm → test/fixtures/safarizone.asm
diff --git a/test/silphco.asm → test/fixtures/silphco.asm b/test/silphco.asm → test/fixtures/silphco.asm
diff --git a/test/ssanne.asm → test/fixtures/ssanne.asm b/test/ssanne.asm → test/fixtures/ssanne.asm
diff --git a/test/surfing.asm → test/fixtures/surfing.asm b/test/surfing.asm → test/fixtures/surfing.asm
diff --git a/test/surfingpikachu.asm → test/fixtures/surfingpikachu.asm b/test/surfingpikachu.asm → test/fixtures/surfingpikachu.asm
diff --git a/test/titlescreen.asm → test/fixtures/titlescreen.asm b/test/titlescreen.asm → test/fixtures/titlescreen.asm
diff --git a/test/trainerbattle.asm → test/fixtures/trainerbattle.asm b/test/trainerbattle.asm → test/fixtures/trainerbattle.asm
diff --git a/test/unusedsong.asm → test/fixtures/unusedsong.asm b/test/unusedsong.asm → test/fixtures/unusedsong.asm
diff --git a/test/vermilion.asm → test/fixtures/vermilion.asm b/test/vermilion.asm → test/fixtures/vermilion.asm
diff --git a/test/wildbattle.asm → test/fixtures/wildbattle.asm b/test/wildbattle.asm → test/fixtures/wildbattle.asm
diff --git a/test/yellowintro.asm → test/fixtures/yellowintro.asm b/test/yellowintro.asm → test/fixtures/yellowintro.asm
diff --git a/test/yellowunusedsong.asm → test/fixtures/yellowunusedsong.asm b/test/yellowunusedsong.asm → test/fixtures/yellowunusedsong.asm
diff --git a/test.sh → test/run b/test.sh → test/run
@@ -2,7 +2,7 @@
 set -e
 set -u
 
-for asm in test/*.asm; do
+for asm in `dirname $0`/fixtures/*.asm; do
   echo " => $asm"
   echo "asm -> mid"
   dist/build/pokemid/pokemid $asm $asm.mid