Move tests in basic/tests/ up one level preparating to multiple test dirs.

87 files changed, 2 insertions, 2 deletions

diff --git a/tests/basics/tests/0prelim.py b/tests/basics/0prelim.py
index 2da65dc279..2da65dc279 100644
--- a/tests/basics/tests/0prelim.py
+++ b/tests/basics/0prelim.py
diff --git a/tests/basics/tests/builtin-len1.py b/tests/basics/builtin-len1.py
index 6a082394c2..6a082394c2 100644
--- a/tests/basics/tests/builtin-len1.py
+++ b/tests/basics/builtin-len1.py
diff --git a/tests/basics/tests/class-subclass-builtin.py b/tests/basics/class-subclass-builtin.py
index 7eb7d44b4d..7eb7d44b4d 100644
--- a/tests/basics/tests/class-subclass-builtin.py
+++ b/tests/basics/class-subclass-builtin.py
diff --git a/tests/basics/tests/class1.py b/tests/basics/class1.py
index bf5f08e64e..bf5f08e64e 100644
--- a/tests/basics/tests/class1.py
+++ b/tests/basics/class1.py
diff --git a/tests/basics/tests/class2.py b/tests/basics/class2.py
index 64f1f62b96..64f1f62b96 100644
--- a/tests/basics/tests/class2.py
+++ b/tests/basics/class2.py
diff --git a/tests/basics/tests/class3.py b/tests/basics/class3.py
index 3b4f0bb90f..3b4f0bb90f 100644
--- a/tests/basics/tests/class3.py
+++ b/tests/basics/class3.py
diff --git a/tests/basics/tests/class_inherit1.py b/tests/basics/class_inherit1.py
index 9ca2d9f14b..9ca2d9f14b 100644
--- a/tests/basics/tests/class_inherit1.py
+++ b/tests/basics/class_inherit1.py
diff --git a/tests/basics/tests/class_item.py b/tests/basics/class_item.py
index 6061f26075..6061f26075 100644
--- a/tests/basics/tests/class_item.py
+++ b/tests/basics/class_item.py
diff --git a/tests/basics/tests/class_number.py b/tests/basics/class_number.py
index e1dbf4a26c..e1dbf4a26c 100644
--- a/tests/basics/tests/class_number.py
+++ b/tests/basics/class_number.py
diff --git a/tests/basics/tests/class_store.py b/tests/basics/class_store.py
index 658da451bf..658da451bf 100644
--- a/tests/basics/tests/class_store.py
+++ b/tests/basics/class_store.py
diff --git a/tests/basics/tests/closure1.py b/tests/basics/closure1.py
index 610cb70020..610cb70020 100644
--- a/tests/basics/tests/closure1.py
+++ b/tests/basics/closure1.py
diff --git a/tests/basics/tests/closure2.py b/tests/basics/closure2.py
index e4e5154a94..e4e5154a94 100644
--- a/tests/basics/tests/closure2.py
+++ b/tests/basics/closure2.py
diff --git a/tests/basics/tests/comprehension1.py b/tests/basics/comprehension1.py
index 7f541ee53f..7f541ee53f 100644
--- a/tests/basics/tests/comprehension1.py
+++ b/tests/basics/comprehension1.py
diff --git a/tests/basics/tests/containment.py b/tests/basics/containment.py
index 84d40b4e8f..84d40b4e8f 100644
--- a/tests/basics/tests/containment.py
+++ b/tests/basics/containment.py
diff --git a/tests/basics/tests/dict1.py b/tests/basics/dict1.py
index 1356cd4280..1356cd4280 100644
--- a/tests/basics/tests/dict1.py
+++ b/tests/basics/dict1.py
diff --git a/tests/basics/tests/dict2.py b/tests/basics/dict2.py
index 1d5aae576b..1d5aae576b 100644
--- a/tests/basics/tests/dict2.py
+++ b/tests/basics/dict2.py
diff --git a/tests/basics/tests/dict_clear.py b/tests/basics/dict_clear.py
index 6be2778bea..6be2778bea 100644
--- a/tests/basics/tests/dict_clear.py
+++ b/tests/basics/dict_clear.py
diff --git a/tests/basics/tests/dict_copy.py b/tests/basics/dict_copy.py
index c3eb7ffc18..c3eb7ffc18 100644
--- a/tests/basics/tests/dict_copy.py
+++ b/tests/basics/dict_copy.py
diff --git a/tests/basics/tests/dict_fromkeys.py b/tests/basics/dict_fromkeys.py
index d03f6ae9d2..d03f6ae9d2 100644
--- a/tests/basics/tests/dict_fromkeys.py
+++ b/tests/basics/dict_fromkeys.py
diff --git a/tests/basics/tests/dict_get.py b/tests/basics/dict_get.py
index fb43a45eab..fb43a45eab 100644
--- a/tests/basics/tests/dict_get.py
+++ b/tests/basics/dict_get.py
diff --git a/tests/basics/tests/dict_iterator.py b/tests/basics/dict_iterator.py
index f190e32ffd..f190e32ffd 100644
--- a/tests/basics/tests/dict_iterator.py
+++ b/tests/basics/dict_iterator.py
diff --git a/tests/basics/tests/dict_pop.py b/tests/basics/dict_pop.py
index 602560ce9d..602560ce9d 100644
--- a/tests/basics/tests/dict_pop.py
+++ b/tests/basics/dict_pop.py
diff --git a/tests/basics/tests/dict_popitem.py b/tests/basics/dict_popitem.py
index 184735cde6..184735cde6 100644
--- a/tests/basics/tests/dict_popitem.py
+++ b/tests/basics/dict_popitem.py
diff --git a/tests/basics/tests/dict_setdefault.py b/tests/basics/dict_setdefault.py
index 57d0ba4518..57d0ba4518 100644
--- a/tests/basics/tests/dict_setdefault.py
+++ b/tests/basics/dict_setdefault.py
diff --git a/tests/basics/tests/dict_update.py b/tests/basics/dict_update.py
index e7ae0bd965..e7ae0bd965 100644
--- a/tests/basics/tests/dict_update.py
+++ b/tests/basics/dict_update.py
diff --git a/tests/basics/tests/dict_views.py b/tests/basics/dict_views.py
index fbf63fa0ac..fbf63fa0ac 100644
--- a/tests/basics/tests/dict_views.py
+++ b/tests/basics/dict_views.py
diff --git a/tests/basics/tests/enumerate.py b/tests/basics/enumerate.py
index f2bdf4f326..f2bdf4f326 100644
--- a/tests/basics/tests/enumerate.py
+++ b/tests/basics/enumerate.py
diff --git a/tests/basics/tests/eval1.py b/tests/basics/eval1.py
index 8b9d02e61b..8b9d02e61b 100644
--- a/tests/basics/tests/eval1.py
+++ b/tests/basics/eval1.py
diff --git a/tests/basics/tests/exception1.py b/tests/basics/exception1.py
index 71d5ad3041..71d5ad3041 100644
--- a/tests/basics/tests/exception1.py
+++ b/tests/basics/exception1.py
diff --git a/tests/basics/tests/filter.py b/tests/basics/filter.py
index 5883e3d00b..5883e3d00b 100644
--- a/tests/basics/tests/filter.py
+++ b/tests/basics/filter.py
diff --git a/tests/basics/tests/float1.py b/tests/basics/float1.py
index 200d955856..200d955856 100644
--- a/tests/basics/tests/float1.py
+++ b/tests/basics/float1.py
diff --git a/tests/basics/tests/for1.py b/tests/basics/for1.py
index c6199416cd..c6199416cd 100644
--- a/tests/basics/tests/for1.py
+++ b/tests/basics/for1.py
diff --git a/tests/basics/tests/fun1.py b/tests/basics/fun1.py
index e12bdbe03e..e12bdbe03e 100644
--- a/tests/basics/tests/fun1.py
+++ b/tests/basics/fun1.py
diff --git a/tests/basics/tests/fun2.py b/tests/basics/fun2.py
index a3c3e7babf..a3c3e7babf 100644
--- a/tests/basics/tests/fun2.py
+++ b/tests/basics/fun2.py
diff --git a/tests/basics/tests/fun3.py b/tests/basics/fun3.py
index f1458df823..f1458df823 100644
--- a/tests/basics/tests/fun3.py
+++ b/tests/basics/fun3.py
diff --git a/tests/basics/tests/generator1.py b/tests/basics/generator1.py
index d4028b0ce3..d4028b0ce3 100644
--- a/tests/basics/tests/generator1.py
+++ b/tests/basics/generator1.py
diff --git a/tests/basics/tests/generator2.py b/tests/basics/generator2.py
index 0dfc98a2d6..0dfc98a2d6 100644
--- a/tests/basics/tests/generator2.py
+++ b/tests/basics/generator2.py
diff --git a/tests/basics/tests/import1a.py b/tests/basics/import1a.py
index 16b2d4d30f..16b2d4d30f 100644
--- a/tests/basics/tests/import1a.py
+++ b/tests/basics/import1a.py
diff --git a/tests/basics/tests/import1b.py b/tests/basics/import1b.py
index 80479088f0..80479088f0 100644
--- a/tests/basics/tests/import1b.py
+++ b/tests/basics/import1b.py
diff --git a/tests/basics/tests/int-small.py b/tests/basics/int-small.py
index be338c4a4c..be338c4a4c 100644
--- a/tests/basics/tests/int-small.py
+++ b/tests/basics/int-small.py
diff --git a/tests/basics/tests/int1.py b/tests/basics/int1.py
index 4ce0f9e70c..4ce0f9e70c 100644
--- a/tests/basics/tests/int1.py
+++ b/tests/basics/int1.py
diff --git a/tests/basics/tests/is-isnot.py b/tests/basics/is-isnot.py
index 990190aa41..990190aa41 100644
--- a/tests/basics/tests/is-isnot.py
+++ b/tests/basics/is-isnot.py
diff --git a/tests/basics/tests/lambda1.py b/tests/basics/lambda1.py
index 06111d6a93..06111d6a93 100644
--- a/tests/basics/tests/lambda1.py
+++ b/tests/basics/lambda1.py
diff --git a/tests/basics/tests/list1.py b/tests/basics/list1.py
index 250a12b704..250a12b704 100644
--- a/tests/basics/tests/list1.py
+++ b/tests/basics/list1.py
diff --git a/tests/basics/tests/list_clear.py b/tests/basics/list_clear.py
index 406d7e8237..406d7e8237 100644
--- a/tests/basics/tests/list_clear.py
+++ b/tests/basics/list_clear.py
diff --git a/tests/basics/tests/list_compare.py b/tests/basics/list_compare.py
index eea8814247..eea8814247 100644
--- a/tests/basics/tests/list_compare.py
+++ b/tests/basics/list_compare.py
diff --git a/tests/basics/tests/list_copy.py b/tests/basics/list_copy.py
index bc450782e3..bc450782e3 100644
--- a/tests/basics/tests/list_copy.py
+++ b/tests/basics/list_copy.py
diff --git a/tests/basics/tests/list_count.py b/tests/basics/list_count.py
index db93b3a2f8..db93b3a2f8 100644
--- a/tests/basics/tests/list_count.py
+++ b/tests/basics/list_count.py
diff --git a/tests/basics/tests/list_index.py b/tests/basics/list_index.py
index f28263fba6..f28263fba6 100644
--- a/tests/basics/tests/list_index.py
+++ b/tests/basics/list_index.py
diff --git a/tests/basics/tests/list_insert.py b/tests/basics/list_insert.py
index 6db97cf5c1..6db97cf5c1 100644
--- a/tests/basics/tests/list_insert.py
+++ b/tests/basics/list_insert.py
diff --git a/tests/basics/tests/list_mult.py b/tests/basics/list_mult.py
index ec65fbb3f4..ec65fbb3f4 100644
--- a/tests/basics/tests/list_mult.py
+++ b/tests/basics/list_mult.py
diff --git a/tests/basics/tests/list_pop.py b/tests/basics/list_pop.py
index bb2ccc6d67..bb2ccc6d67 100644
--- a/tests/basics/tests/list_pop.py
+++ b/tests/basics/list_pop.py
diff --git a/tests/basics/tests/list_remove.py b/tests/basics/list_remove.py
index 81b2b3d973..81b2b3d973 100644
--- a/tests/basics/tests/list_remove.py
+++ b/tests/basics/list_remove.py
diff --git a/tests/basics/tests/list_reverse.py b/tests/basics/list_reverse.py
index 38acf1fd61..38acf1fd61 100644
--- a/tests/basics/tests/list_reverse.py
+++ b/tests/basics/list_reverse.py
diff --git a/tests/basics/tests/list_sort.py b/tests/basics/list_sort.py
index eff12b9c80..eff12b9c80 100644
--- a/tests/basics/tests/list_sort.py
+++ b/tests/basics/list_sort.py
diff --git a/tests/basics/tests/list_sum.py b/tests/basics/list_sum.py
index e46042b86a..e46042b86a 100644
--- a/tests/basics/tests/list_sum.py
+++ b/tests/basics/list_sum.py
diff --git a/tests/basics/tests/map.py b/tests/basics/map.py
index 62dca44ede..62dca44ede 100644
--- a/tests/basics/tests/map.py
+++ b/tests/basics/map.py
diff --git a/tests/basics/tests/set1.py b/tests/basics/set1.py
index c54fbd8379..c54fbd8379 100644
--- a/tests/basics/tests/set1.py
+++ b/tests/basics/set1.py
diff --git a/tests/basics/tests/set_add.py b/tests/basics/set_add.py
index f2a372f307..f2a372f307 100644
--- a/tests/basics/tests/set_add.py
+++ b/tests/basics/set_add.py
diff --git a/tests/basics/tests/set_binop.py b/tests/basics/set_binop.py
index d0d0b8027b..d0d0b8027b 100644
--- a/tests/basics/tests/set_binop.py
+++ b/tests/basics/set_binop.py
diff --git a/tests/basics/tests/set_clear.py b/tests/basics/set_clear.py
index 6fda93f0fb..6fda93f0fb 100644
--- a/tests/basics/tests/set_clear.py
+++ b/tests/basics/set_clear.py
diff --git a/tests/basics/tests/set_copy.py b/tests/basics/set_copy.py
index 2ea308b0db..2ea308b0db 100644
--- a/tests/basics/tests/set_copy.py
+++ b/tests/basics/set_copy.py
diff --git a/tests/basics/tests/set_difference.py b/tests/basics/set_difference.py
index 26976116f3..26976116f3 100644
--- a/tests/basics/tests/set_difference.py
+++ b/tests/basics/set_difference.py
diff --git a/tests/basics/tests/set_discard.py b/tests/basics/set_discard.py
index baac26413c..baac26413c 100644
--- a/tests/basics/tests/set_discard.py
+++ b/tests/basics/set_discard.py
diff --git a/tests/basics/tests/set_intersection.py b/tests/basics/set_intersection.py
index 6f3dfc7414..6f3dfc7414 100644
--- a/tests/basics/tests/set_intersection.py
+++ b/tests/basics/set_intersection.py
diff --git a/tests/basics/tests/set_isdisjoint.py b/tests/basics/set_isdisjoint.py
index 7fb7e769bb..7fb7e769bb 100644
--- a/tests/basics/tests/set_isdisjoint.py
+++ b/tests/basics/set_isdisjoint.py
diff --git a/tests/basics/tests/set_isfooset.py b/tests/basics/set_isfooset.py
index ce7952cd2c..ce7952cd2c 100644
--- a/tests/basics/tests/set_isfooset.py
+++ b/tests/basics/set_isfooset.py
diff --git a/tests/basics/tests/set_iter.py b/tests/basics/set_iter.py
index 2960177303..2960177303 100644
--- a/tests/basics/tests/set_iter.py
+++ b/tests/basics/set_iter.py
diff --git a/tests/basics/tests/set_pop.py b/tests/basics/set_pop.py
index 0cd478ce25..0cd478ce25 100644
--- a/tests/basics/tests/set_pop.py
+++ b/tests/basics/set_pop.py
diff --git a/tests/basics/tests/set_remove.py b/tests/basics/set_remove.py
index 208ab137f3..208ab137f3 100644
--- a/tests/basics/tests/set_remove.py
+++ b/tests/basics/set_remove.py
diff --git a/tests/basics/tests/set_symmetric_difference.py b/tests/basics/set_symmetric_difference.py
index acf298385a..acf298385a 100644
--- a/tests/basics/tests/set_symmetric_difference.py
+++ b/tests/basics/set_symmetric_difference.py
diff --git a/tests/basics/tests/set_union.py b/tests/basics/set_union.py
index 2adcc972c0..2adcc972c0 100644
--- a/tests/basics/tests/set_union.py
+++ b/tests/basics/set_union.py
diff --git a/tests/basics/tests/set_update.py b/tests/basics/set_update.py
index 78cd763560..78cd763560 100644
--- a/tests/basics/tests/set_update.py
+++ b/tests/basics/set_update.py
diff --git a/tests/basics/tests/sorted.py b/tests/basics/sorted.py
index bbec319460..bbec319460 100644
--- a/tests/basics/tests/sorted.py
+++ b/tests/basics/sorted.py
diff --git a/tests/basics/tests/string-format.py b/tests/basics/string-format.py
index ba51e0890b..ba51e0890b 100644
--- a/tests/basics/tests/string-format.py
+++ b/tests/basics/string-format.py
diff --git a/tests/basics/tests/string-slice.py b/tests/basics/string-slice.py
index 7538ae5700..7538ae5700 100644
--- a/tests/basics/tests/string-slice.py
+++ b/tests/basics/string-slice.py
diff --git a/tests/basics/tests/string1.py b/tests/basics/string1.py
index 3fecf799be..3fecf799be 100644
--- a/tests/basics/tests/string1.py
+++ b/tests/basics/string1.py
diff --git a/tests/basics/tests/string_find.py b/tests/basics/string_find.py
index 90063228f8..90063228f8 100644
--- a/tests/basics/tests/string_find.py
+++ b/tests/basics/string_find.py
diff --git a/tests/basics/tests/true-value.py b/tests/basics/true-value.py
index 6ba410ddc2..6ba410ddc2 100644
--- a/tests/basics/tests/true-value.py
+++ b/tests/basics/true-value.py
diff --git a/tests/basics/tests/try1.py b/tests/basics/try1.py
index 56d3075041..56d3075041 100644
--- a/tests/basics/tests/try1.py
+++ b/tests/basics/try1.py
diff --git a/tests/basics/tests/try2.py b/tests/basics/try2.py
index 1cca9e039a..1cca9e039a 100644
--- a/tests/basics/tests/try2.py
+++ b/tests/basics/try2.py
diff --git a/tests/basics/tests/try3.py b/tests/basics/try3.py
index 31bacd3b36..31bacd3b36 100644
--- a/tests/basics/tests/try3.py
+++ b/tests/basics/try3.py
diff --git a/tests/basics/tests/try4.py b/tests/basics/try4.py
index 4d324c1876..4d324c1876 100644
--- a/tests/basics/tests/try4.py
+++ b/tests/basics/try4.py
diff --git a/tests/basics/tests/types1.py b/tests/basics/types1.py
index 850b31b08c..850b31b08c 100644
--- a/tests/basics/tests/types1.py
+++ b/tests/basics/types1.py
diff --git a/tests/basics/tests/while1.py b/tests/basics/while1.py
index a9bb5d2792..a9bb5d2792 100644
--- a/tests/basics/tests/while1.py
+++ b/tests/basics/while1.py
diff --git a/tests/basics/tests/zip.py b/tests/basics/zip.py
index c0109094f4..c0109094f4 100644
--- a/tests/basics/tests/zip.py
+++ b/tests/basics/zip.py
diff --git a/tests/basics/run-tests b/tests/run-tests
index bc2969ae3d..7ab1281337 100755
--- a/tests/basics/run-tests
+++ b/tests/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
 do
     basename=`basename $infile .py`
     outfile=${basename}.out