From 663626f06d79aa4d3d3b17e0391897c852658a28 Mon Sep 17 00:00:00 2001
From: Christopher Peplin <chris.peplin@rhubarbtech.com>
Date: Sat, 20 Sep 2014 16:26:08 -0400
Subject: [PATCH] Move scripts inside tests directory.

Fixed https://github.com/sudar/Arduino-Makefile/issues/260
---
 .travis.yml                                             | 4 ++--
 README.md                                               | 9 ++++++---
 examples/TestSuiteCommon.mk                             | 2 +-
 {script => tests/script}/bootstrap.sh                   | 0
 {script => tests/script}/bootstrap/arduino.sh           | 0
 {script => tests/script}/bootstrap/chipkit.sh           | 0
 {script => tests/script}/bootstrap/common.sh            | 2 +-
 {script => tests/script}/bootstrap/pip-requirements.txt | 0
 {script => tests/script}/runtests.sh                    | 0
 9 files changed, 10 insertions(+), 7 deletions(-)
 rename {script => tests/script}/bootstrap.sh (100%)
 rename {script => tests/script}/bootstrap/arduino.sh (100%)
 rename {script => tests/script}/bootstrap/chipkit.sh (100%)
 rename {script => tests/script}/bootstrap/common.sh (98%)
 rename {script => tests/script}/bootstrap/pip-requirements.txt (100%)
 rename {script => tests/script}/runtests.sh (100%)

diff --git a/.travis.yml b/.travis.yml
index 68efeb5..f97a4ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: c
 compiler:
   - gcc
-script: script/runtests.sh
-before_install: script/bootstrap.sh
+script: tests/script/runtests.sh
+before_install: tests/script/bootstrap.sh
diff --git a/README.md b/README.md
index b929f6c..a5f1cff 100644
--- a/README.md
+++ b/README.md
@@ -215,9 +215,12 @@ Then, the following line must be added to the project Makefile :
 ## Test Suite
 
 This project includes a suite of example Makefiles and small Arduino and chipKIT
-programs to assist the developers. Run `script/bootstrap.sh` to attempt to
-automatically install the dependencies (Arduino IDE, MPIDE, etc.). Run
-`script/runtests.sh` to attempt to compile all of the examples.
+programs to assist the maintainers of the Makefile. Run
+`tests/script/bootstrap.sh` to attempt to automatically install the dependencies
+(Arduino IDE, MPIDE, etc.). Run `tests/script/runtests.sh` to attempt to compile
+all of the examples. The bootstrap script is primarily intended for use by a
+continuous integration server, specifically Travis CI. It is not intended for
+normal users.
 
 ### Bare-Arduino–Project
 
diff --git a/examples/TestSuiteCommon.mk b/examples/TestSuiteCommon.mk
index 5fa4f50..a66a007 100644
--- a/examples/TestSuiteCommon.mk
+++ b/examples/TestSuiteCommon.mk
@@ -1,5 +1,5 @@
 ARDMK_DIR=../../
-DEPENDENCIES_FOLDER = ../../dependencies
+DEPENDENCIES_FOLDER = /var/tmp/Arduino-Makefile-testing-dependencies
 DEPENDENCIES_MPIDE_DIR = $(DEPENDENCIES_FOLDER)/mpide-0023-linux64-20130817-test
 
 ifeq ($(MPIDE_DIR),)
diff --git a/script/bootstrap.sh b/tests/script/bootstrap.sh
similarity index 100%
rename from script/bootstrap.sh
rename to tests/script/bootstrap.sh
diff --git a/script/bootstrap/arduino.sh b/tests/script/bootstrap/arduino.sh
similarity index 100%
rename from script/bootstrap/arduino.sh
rename to tests/script/bootstrap/arduino.sh
diff --git a/script/bootstrap/chipkit.sh b/tests/script/bootstrap/chipkit.sh
similarity index 100%
rename from script/bootstrap/chipkit.sh
rename to tests/script/bootstrap/chipkit.sh
diff --git a/script/bootstrap/common.sh b/tests/script/bootstrap/common.sh
similarity index 98%
rename from script/bootstrap/common.sh
rename to tests/script/bootstrap/common.sh
index 695d6b7..a6b6415 100644
--- a/script/bootstrap/common.sh
+++ b/tests/script/bootstrap/common.sh
@@ -132,7 +132,7 @@ if [ -z $COMMON_SOURCED ]; then
 
     echo "Storing all downloaded dependencies in the \"dependencies\" folder"
 
-    DEPENDENCIES_FOLDER="dependencies"
+    DEPENDENCIES_FOLDER="/var/tmp/Arduino-Makefile-testing-dependencies"
     mkdir -p $DEPENDENCIES_FOLDER
 
     if ! command -v make >/dev/null 2>&1; then
diff --git a/script/bootstrap/pip-requirements.txt b/tests/script/bootstrap/pip-requirements.txt
similarity index 100%
rename from script/bootstrap/pip-requirements.txt
rename to tests/script/bootstrap/pip-requirements.txt
diff --git a/script/runtests.sh b/tests/script/runtests.sh
similarity index 100%
rename from script/runtests.sh
rename to tests/script/runtests.sh