summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-07 00:54:53 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-07 00:54:53 +0100
commit3bb8663282fd41704c2e06de17138dae605aeacd (patch)
treea1bc856af40813a139bb0af4623e2261b52cc68f
parentc75427baaa9f455497c46f754d6f4e8c594fb897 (diff)
parentbd6f3d31d2a78bbcfeabcf9f358797020de9b93e (diff)
Merge branch 'master' of github.com:micropython/micropython
-rw-r--r--tests/basics/set_union.py2
-rwxr-xr-xtools/pip-micropython6
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/basics/set_union.py b/tests/basics/set_union.py
index 2adcc972c..572d12f66 100644
--- a/tests/basics/set_union.py
+++ b/tests/basics/set_union.py
@@ -1 +1 @@
-print({1}.union({2}))
+print(sorted({1}.union({2})))
diff --git a/tools/pip-micropython b/tools/pip-micropython
index e27e85942..fab880983 100755
--- a/tools/pip-micropython
+++ b/tools/pip-micropython
@@ -6,6 +6,12 @@
# ports (if PIP_MICROPY_DEST environment var is set).
#
+if [ "$1" != "install" ]; then
+ echo "Only install command is supported currently"
+ exit 1
+fi
+shift
+
if [ -n "$PIP_MICROPY_DEST" ]; then
dest="$PIP_MICROPY_DEST"
echo "Destination snapshot directory: $dest"