aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Peplin <chris.peplin@rhubarbtech.com>2014-09-20 16:26:08 -0400
committerChristopher Peplin <chris.peplin@rhubarbtech.com>2014-09-20 16:26:39 -0400
commit663626f06d79aa4d3d3b17e0391897c852658a28 (patch)
tree05fd05167e6d68ef3a01bbd5e8d49aa683daa730
parent086c6e96ca4b98e8a144b5f7f37a7b3b6fedc61d (diff)
Move scripts inside tests directory.
Fixed https://github.com/sudar/Arduino-Makefile/issues/260
-rw-r--r--.travis.yml4
-rw-r--r--README.md9
-rw-r--r--examples/TestSuiteCommon.mk2
-rwxr-xr-xtests/script/bootstrap.sh (renamed from script/bootstrap.sh)0
-rw-r--r--tests/script/bootstrap/arduino.sh (renamed from script/bootstrap/arduino.sh)0
-rw-r--r--tests/script/bootstrap/chipkit.sh (renamed from script/bootstrap/chipkit.sh)0
-rw-r--r--tests/script/bootstrap/common.sh (renamed from script/bootstrap/common.sh)2
-rw-r--r--tests/script/bootstrap/pip-requirements.txt (renamed from script/bootstrap/pip-requirements.txt)0
-rwxr-xr-xtests/script/runtests.sh (renamed from script/runtests.sh)0
9 files changed, 10 insertions, 7 deletions
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
index 083bf5d..083bf5d 100755
--- a/script/bootstrap.sh
+++ b/tests/script/bootstrap.sh
diff --git a/script/bootstrap/arduino.sh b/tests/script/bootstrap/arduino.sh
index 3c7e9d7..3c7e9d7 100644
--- a/script/bootstrap/arduino.sh
+++ b/tests/script/bootstrap/arduino.sh
diff --git a/script/bootstrap/chipkit.sh b/tests/script/bootstrap/chipkit.sh
index efe9615..efe9615 100644
--- a/script/bootstrap/chipkit.sh
+++ b/tests/script/bootstrap/chipkit.sh
diff --git a/script/bootstrap/common.sh b/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
index 8313187..8313187 100644
--- a/script/bootstrap/pip-requirements.txt
+++ b/tests/script/bootstrap/pip-requirements.txt
diff --git a/script/runtests.sh b/tests/script/runtests.sh
index 5f513da..5f513da 100755
--- a/script/runtests.sh
+++ b/tests/script/runtests.sh