Merge pull request #321 from ctiller/build-cleaner

Build cleaner updates

2 files changed, 14 insertions, 14 deletions

diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py
index f9307360c3..4992beb897 100755
--- a/tools/buildgen/build-cleaner.py
+++ b/tools/buildgen/build-cleaner.py
@@ -33,9 +33,9 @@ def clean_elem(indict):
   for name in ['public_headers', 'headers', 'src']:
     if name not in indict: continue
     inlist = indict[name]
-    protos = set(x for x in inlist if os.path.splitext(x)[1] == '.proto')
+    protos = list(x for x in inlist if os.path.splitext(x)[1] == '.proto')
     others = set(x for x in inlist if x not in protos)
-    indict[name] = sorted(protos) + sorted(others)
+    indict[name] = protos + sorted(others)
   return rebuild_as_ordered_dict(indict, _ELEM_KEYS)
 
 for filename in sys.argv[1:]:
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index b3ebc1f869..fd15182120 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -187,6 +187,14 @@
   }, 
   {
     "language": "c", 
+    "name": "json_rewrite_test"
+  }, 
+  {
+    "language": "c", 
+    "name": "json_test"
+  }, 
+  {
+    "language": "c", 
     "name": "lame_client_test"
   }, 
   {
@@ -250,14 +258,6 @@
     "name": "transport_metadata_test"
   }, 
   {
-    "language": "c", 
-    "name": "json_test"
-  }, 
-  {
-    "language": "c", 
-    "name": "json_rewrite_test"
-  }, 
-  {
     "language": "c++", 
     "name": "channel_arguments_test"
   }, 
@@ -271,10 +271,6 @@
   }, 
   {
     "language": "c++", 
-    "name": "tips_client_test"
-  }, 
-  {
-    "language": "c++", 
     "name": "status_test"
   }, 
   {
@@ -286,6 +282,10 @@
     "name": "thread_pool_test"
   }, 
   {
+    "language": "c++", 
+    "name": "tips_client_test"
+  }, 
+  {
     "language": "c", 
     "name": "chttp2_fake_security_cancel_after_accept_test"
   },