building/running-tests.md

@@ -259,12 +259,6 @@ these steps:
 
 > > > **skip_if_fast**          skip if "fast" is enabled
 
-> > > **skip_if_platform(platform)**  skip if we're on the named platform
-
-> > > **skip_if_tag(tag)**      skip if the compiler has a given tag
-
-> > > **skip_unless_tag(tag)**  skip unless the compiler has a given tag
-
 > > > **omit_ways(ways)**       skip this test for certain ways
 
 > > > **only_ways(ways)**       do this test certain ways only
@@ -279,9 +273,13 @@ these steps:
 
 > > > **expect_broken_for(bug, ways)** as expect_broken, but only for the indicated ways
 
-> > > **expect_broken_if_platform(bug, plat)** as expect_broken, but only for the specific platform given
+> > > **if_compiler_type(compiler_type, f)** Do `f`, but only for the given compiler type
+
+> > > **if_platform(plat, f)**  Do `f`, but only if we are on the specific platform given
 
-> > > **expect_broken_if_compiler_type(bug, compiler_type)** as expect_broken, but only for the given compiler type
+> > > **if_tag(tag, f)**        do `f` if the compiler has a given tag
+
+> > > **unless_tag(tag, f)**    do `f` unless the compiler has a given tag
 
 > > > **set_stdin(file)**       use a different file for stdin
 
@@ -289,8 +287,6 @@ these steps:
 
 > > > **exit_code(n)**          expect an exit code of 'n' from the prog
 
-> > > **exit_code_if_platform(n, plat)** as exit_code, but only for the specific platform given
-
 > > > **extra_run_opts(opts)**  pass some extra opts to the prog
 
 > > > **no_clean**              don't clean up after this test
@@ -334,10 +330,6 @@ these steps:
 
 > > > **expect_fail_for(ways)** expect failure for certain ways 
 
-> > > **expect_fail_if_platform(plat)**      expect failure on a certain platform
-
-> > > **expect_fail_if_compiler_type(compiler)**   expect failure from a certain compiler
-
 > > *\<test-fn\>*
 > > is a function which describes how the test should be
 > > run, and determines the form of \<args\>.  The possible