docs: Sphinxify TestSuiteMakefileGuide

Some small related fixups to TestingGuide too.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167996 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/docs/TestingGuide.rst b/docs/TestingGuide.rst
index db77918..7ca49ce 100644
--- a/docs/TestingGuide.rst
+++ b/docs/TestingGuide.rst
@@ -8,6 +8,11 @@
 .. contents::
    :local:
 
+.. toctree::
+   :hidden:
+
+   TestSuiteMakefileGuide
+
 Overview
 ========
 
@@ -98,10 +103,9 @@
 ``llvm/test`` (so you get these tests for free with the main llvm tree).
 Use "make check-all" to run the regression tests after building LLVM.
 
-The more comprehensive test suite that includes whole programs in C and
-C++ is in the ``test-suite`` module. See ```test-suite``
-Quickstart <#testsuitequickstart>`_ for more information on running
-these tests.
+The more comprehensive test suite that includes whole programs in C and C++
+is in the ``test-suite`` module. See :ref:`test-suite Quickstart
+<test-suite-quickstart>` for more information on running these tests.
 
 Regression tests
 ----------------
@@ -688,6 +692,8 @@
    programs from somewhere else. When using ``LNT``, use the
    ``--test-externals`` option to include these tests in the results.
 
+.. _test-suite-quickstart:
+
 ``test-suite`` Quickstart
 -------------------------
 
@@ -710,4 +716,4 @@
 under the hood may want to understand the Makefile based setup.
 
 For more information on the ``test-suite`` Makefile setup, please see
-the `Test Suite Makefile Guide. <TestSuiteMakefileGuide.html>`_
+the :doc:`Test Suite Makefile Guide <TestSuiteMakefileGuide>`.