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

Conflicts:
	py/objstr.c
	py/py.mk
	py/stream.c
	unix/main.c
	unix/socket.c

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/run-tests b/tests/run-tests
index ef1368725..752138ccc 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -10,7 +10,14 @@ numpassed=0
 numfailed=0
 namefailed=
 
-for infile in basics/*.py io/*.py
+if [ $# -eq 0 ]
+then
+    tests="basics/*.py io/*.py"
+else
+    tests="$@"
+fi
+
+for infile in $tests
 do
     basename=`basename $infile .py`
     outfile=${basename}.out