Merge branch 'master' of github.com:micropython/micropython

2014-01-19 17:41:01 +00:00 · 2014-01-19 17:41:01 +00:00 · 5f7e8dc176
parent b2ebb161d4 db796ef84d
commit 5f7e8dc176
90 changed files with 13 additions and 2 deletions
--- a/tests/README
+++ b/tests/README
@ -0,0 +1,4 @@
+This directory contains tests for various functionality areas of MicroPython.
+To run all stable tests, run "run-tests" script in this directory. Note
+that bytecode tests are not yet stable and should be run separately in
+"bytecode" subdirectory.
--- a/tests/basics/tests/0prelim.py
+++ b/tests/basics/tests/0prelim.py
--- a/tests/basics/tests/builtin-len1.py
+++ b/tests/basics/tests/builtin-len1.py
--- a/tests/basics/tests/class-subclass-builtin.py
+++ b/tests/basics/tests/class-subclass-builtin.py
--- a/tests/basics/tests/class1.py
+++ b/tests/basics/tests/class1.py
--- a/tests/basics/tests/class2.py
+++ b/tests/basics/tests/class2.py
--- a/tests/basics/tests/class3.py
+++ b/tests/basics/tests/class3.py
--- a/tests/basics/tests/class_inherit1.py
+++ b/tests/basics/tests/class_inherit1.py
--- a/tests/basics/tests/class_item.py
+++ b/tests/basics/tests/class_item.py
--- a/tests/basics/tests/class_number.py
+++ b/tests/basics/tests/class_number.py
--- a/tests/basics/tests/class_store.py
+++ b/tests/basics/tests/class_store.py
--- a/tests/basics/tests/closure1.py
+++ b/tests/basics/tests/closure1.py
--- a/tests/basics/tests/closure2.py
+++ b/tests/basics/tests/closure2.py
--- a/tests/basics/tests/comprehension1.py
+++ b/tests/basics/tests/comprehension1.py
--- a/tests/basics/tests/containment.py
+++ b/tests/basics/tests/containment.py
--- a/tests/basics/tests/dict1.py
+++ b/tests/basics/tests/dict1.py
--- a/tests/basics/tests/dict2.py
+++ b/tests/basics/tests/dict2.py
--- a/tests/basics/tests/dict_clear.py
+++ b/tests/basics/tests/dict_clear.py
--- a/tests/basics/tests/dict_copy.py
+++ b/tests/basics/tests/dict_copy.py
--- a/tests/basics/tests/dict_fromkeys.py
+++ b/tests/basics/tests/dict_fromkeys.py
--- a/tests/basics/tests/dict_get.py
+++ b/tests/basics/tests/dict_get.py
--- a/tests/basics/tests/dict_iterator.py
+++ b/tests/basics/tests/dict_iterator.py
--- a/tests/basics/tests/dict_pop.py
+++ b/tests/basics/tests/dict_pop.py
--- a/tests/basics/tests/dict_popitem.py
+++ b/tests/basics/tests/dict_popitem.py
--- a/tests/basics/tests/dict_setdefault.py
+++ b/tests/basics/tests/dict_setdefault.py
--- a/tests/basics/tests/dict_update.py
+++ b/tests/basics/tests/dict_update.py
--- a/tests/basics/tests/dict_views.py
+++ b/tests/basics/tests/dict_views.py
--- a/tests/basics/tests/enumerate.py
+++ b/tests/basics/tests/enumerate.py
--- a/tests/basics/tests/eval1.py
+++ b/tests/basics/tests/eval1.py
--- a/tests/basics/tests/exception1.py
+++ b/tests/basics/tests/exception1.py
--- a/tests/basics/tests/filter.py
+++ b/tests/basics/tests/filter.py
--- a/tests/basics/tests/float1.py
+++ b/tests/basics/tests/float1.py
--- a/tests/basics/tests/for1.py
+++ b/tests/basics/tests/for1.py
--- a/tests/basics/tests/fun1.py
+++ b/tests/basics/tests/fun1.py
--- a/tests/basics/tests/fun2.py
+++ b/tests/basics/tests/fun2.py
--- a/tests/basics/tests/fun3.py
+++ b/tests/basics/tests/fun3.py
--- a/tests/basics/tests/generator1.py
+++ b/tests/basics/tests/generator1.py
--- a/tests/basics/tests/generator2.py
+++ b/tests/basics/tests/generator2.py
--- a/tests/basics/tests/import1a.py
+++ b/tests/basics/tests/import1a.py
--- a/tests/basics/tests/import1b.py
+++ b/tests/basics/tests/import1b.py
--- a/tests/basics/tests/int-small.py
+++ b/tests/basics/tests/int-small.py
--- a/tests/basics/tests/int1.py
+++ b/tests/basics/tests/int1.py
--- a/tests/basics/tests/is-isnot.py
+++ b/tests/basics/tests/is-isnot.py
--- a/tests/basics/tests/lambda1.py
+++ b/tests/basics/tests/lambda1.py
--- a/tests/basics/tests/list1.py
+++ b/tests/basics/tests/list1.py
--- a/tests/basics/tests/list_clear.py
+++ b/tests/basics/tests/list_clear.py
--- a/tests/basics/tests/list_compare.py
+++ b/tests/basics/tests/list_compare.py
--- a/tests/basics/tests/list_copy.py
+++ b/tests/basics/tests/list_copy.py
--- a/tests/basics/tests/list_count.py
+++ b/tests/basics/tests/list_count.py
--- a/tests/basics/tests/list_index.py
+++ b/tests/basics/tests/list_index.py
--- a/tests/basics/tests/list_insert.py
+++ b/tests/basics/tests/list_insert.py
--- a/tests/basics/tests/list_mult.py
+++ b/tests/basics/tests/list_mult.py
--- a/tests/basics/tests/list_pop.py
+++ b/tests/basics/tests/list_pop.py
--- a/tests/basics/tests/list_remove.py
+++ b/tests/basics/tests/list_remove.py
--- a/tests/basics/tests/list_reverse.py
+++ b/tests/basics/tests/list_reverse.py
--- a/tests/basics/tests/list_sort.py
+++ b/tests/basics/tests/list_sort.py
--- a/tests/basics/tests/list_sum.py
+++ b/tests/basics/tests/list_sum.py
--- a/tests/basics/tests/map.py
+++ b/tests/basics/tests/map.py
--- a/tests/basics/tests/set1.py
+++ b/tests/basics/tests/set1.py
--- a/tests/basics/tests/set_add.py
+++ b/tests/basics/tests/set_add.py
--- a/tests/basics/tests/set_binop.py
+++ b/tests/basics/tests/set_binop.py
--- a/tests/basics/tests/set_clear.py
+++ b/tests/basics/tests/set_clear.py
--- a/tests/basics/tests/set_copy.py
+++ b/tests/basics/tests/set_copy.py
--- a/tests/basics/tests/set_difference.py
+++ b/tests/basics/tests/set_difference.py
--- a/tests/basics/tests/set_discard.py
+++ b/tests/basics/tests/set_discard.py
--- a/tests/basics/tests/set_intersection.py
+++ b/tests/basics/tests/set_intersection.py
--- a/tests/basics/tests/set_isdisjoint.py
+++ b/tests/basics/tests/set_isdisjoint.py
--- a/tests/basics/tests/set_isfooset.py
+++ b/tests/basics/tests/set_isfooset.py
--- a/tests/basics/tests/set_iter.py
+++ b/tests/basics/tests/set_iter.py
--- a/tests/basics/tests/set_pop.py
+++ b/tests/basics/tests/set_pop.py
--- a/tests/basics/tests/set_remove.py
+++ b/tests/basics/tests/set_remove.py
--- a/tests/basics/tests/set_symmetric_difference.py
+++ b/tests/basics/tests/set_symmetric_difference.py
--- a/tests/basics/tests/set_union.py
+++ b/tests/basics/tests/set_union.py
--- a/tests/basics/tests/set_update.py
+++ b/tests/basics/tests/set_update.py
--- a/tests/basics/tests/sorted.py
+++ b/tests/basics/tests/sorted.py
--- a/tests/basics/tests/string-format.py
+++ b/tests/basics/tests/string-format.py
--- a/tests/basics/tests/string-slice.py
+++ b/tests/basics/tests/string-slice.py
--- a/tests/basics/tests/string1.py
+++ b/tests/basics/tests/string1.py
--- a/tests/basics/tests/string_find.py
+++ b/tests/basics/tests/string_find.py
--- a/tests/basics/tests/true-value.py
+++ b/tests/basics/tests/true-value.py
--- a/tests/basics/tests/try1.py
+++ b/tests/basics/tests/try1.py
--- a/tests/basics/tests/try2.py
+++ b/tests/basics/tests/try2.py
--- a/tests/basics/tests/try3.py
+++ b/tests/basics/tests/try3.py
--- a/tests/basics/tests/try4.py
+++ b/tests/basics/tests/try4.py
--- a/tests/basics/tests/types1.py
+++ b/tests/basics/tests/types1.py
--- a/tests/basics/tests/while1.py
+++ b/tests/basics/tests/while1.py
--- a/tests/basics/tests/zip.py
+++ b/tests/basics/tests/zip.py
--- a/tests/io/data/file1
+++ b/tests/io/data/file1
@ -0,0 +1,3 @@
+longer line1
+line2
+line3
--- a/tests/io/file1.py
+++ b/tests/io/file1.py
@ -0,0 +1,4 @@
+f = open("io/data/file1")
+print(f.read(5))
+print(f.readline())
+print(f.read())
--- a/tests/basics/run-tests
+++ b/tests/basics/run-tests
@ -2,7 +2,7 @@

 RM="/bin/rm -f"
 CPYTHON3=python3.3
-MP_PY=../../unix/py
+MP_PY=../unix/py

 numtests=0
 numtestcases=0
@ -10,7 +10,7 @@ numpassed=0
 numfailed=0
 namefailed=

-for infile in tests/*.py
+for infile in basics/*.py io/*.py
 do
    basename=`basename $infile .py`
    outfile=${basename}.out