Merge pull request #16580 from gottesmm/pr-682874a47bc55c30cad87669717e6645c865fe86

swift-ci · web-flow · commit 1fdad960f4c2 · 2018-07-26T11:25:21.000-07:00
diff --git a/utils/update_checkout/__init__.py b/utils/update_checkout/__init__.py
@@ -0,0 +1,4 @@
+
+from update_checkout import main
+
+__all__ = ["main"]
diff --git a/utils/update_checkout/tests/__init__.py b/utils/update_checkout/tests/__init__.py
diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json
diff --git a/utils/update_checkout/update_checkout/__init__.py b/utils/update_checkout/update_checkout/__init__.py
@@ -0,0 +1,4 @@
+
+from update_checkout import main
+
+__all__ = ["main"]
diff --git a/utils/update_checkout/update_checkout/update_checkout.py b/utils/update_checkout/update_checkout/update_checkout.py
@@ -414,7 +414,8 @@ def main():
         action='store_true')
     parser.add_argument(
         "--config",
-        default=os.path.join(SCRIPT_DIR, "update-checkout-config.json"),
+        default=os.path.join(SCRIPT_DIR, os.pardir,
+                             "update-checkout-config.json"),
         help="Configuration file to use")
     parser.add_argument(
         "--github-comment",
@@ -518,7 +519,3 @@ def main():
     else:
         print("update-checkout succeeded")
     sys.exit(fail_count)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/validation-test/Python/update_checkout.test-sh b/validation-test/Python/update_checkout.test-sh
@@ -0,0 +1 @@
+// RUN: %{python} -m unittest discover -s %swift_src_root/utils/update_checkout

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +from update_checkout import main
++
 +__all__ = ["main"]
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+// RUN: %{python} -m unittest discover -s %swift_src_root/utils/update_checkout`