summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2015-01-14 00:26:39 +0000
committerDamien George <damien.p.george@gmail.com>2015-01-14 00:26:39 +0000
commitbc47c287dfe15909de6b76f19b8b0968ba54724a (patch)
treeacc4a9c4ce1547d0d44bde3dd2fad303dba55974
parent1e1779eacf4da5cd8699bee26a02eed4eda10101 (diff)
downloadmicropython-bc47c287dfe15909de6b76f19b8b0968ba54724a.tar.gz
micropython-bc47c287dfe15909de6b76f19b8b0968ba54724a.zip
travis, minimal: Install gcc-multilib for -m32; use /bin/echo for test.
-rw-r--r--.travis.yml2
-rw-r--r--minimal/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index bb3cda8661..efd43b1377 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ before_script:
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
- sudo apt-get update -qq
- - sudo apt-get install -y python3.3 python3 gcc-4.7 gcc-arm-none-eabi qemu-system mingw32
+ - sudo apt-get install -y python3.3 python3 gcc-4.7 gcc-multilib gcc-arm-none-eabi qemu-system mingw32
# For teensy build
- sudo apt-get install realpath
diff --git a/minimal/Makefile b/minimal/Makefile
index 78d1f4fd2f..592911516d 100644
--- a/minimal/Makefile
+++ b/minimal/Makefile
@@ -72,6 +72,6 @@ run:
reset
test: $(BUILD)/firmware.elf
- $(Q)echo -e "print('hello world!', list(x+1 for x in range(10)), end='eol\\\\n')\\r\\n\\x04" | $(BUILD)/firmware.elf | tail -n2 | grep "^hello world! \\[1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\]eol"
+ $(Q)/bin/echo -e "print('hello world!', list(x+1 for x in range(10)), end='eol\\\\n')\\r\\n\\x04" | $(BUILD)/firmware.elf | tail -n2 | grep "^hello world! \\[1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\]eol"
include ../py/mkrules.mk