5 files changed, 14 insertions, 33 deletions
diff --git a/erts/etc/common/ct_run.c b/erts/etc/common/ct_run.c
index 7aaab716f7..5e5b612a12 100644
--- a/erts/etc/common/ct_run.c
+++ b/erts/etc/common/ct_run.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2010. All Rights Reserved.
+ * Copyright Ericsson AB 2010-2013. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -85,7 +85,6 @@ static char* strsave(char* string);
 static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
 static char* get_default_emulator(char* progname);
-static void print_deprecation_warning(char *progname); 
 #ifdef __WIN32__
 static char* possibly_quote(char* arg);
 #endif
@@ -132,8 +131,6 @@ main(int argc, char** argv)
     int erl_args;
     char** argv0 = argv;
 
-    print_deprecation_warning(argv[0]);
-
     emulator = get_default_emulator(argv[0]);
 
     /*
@@ -447,15 +444,6 @@ static char *simple_basename(char *path)
     return path;
 }
 
-static void print_deprecation_warning(char* progpath)
-{
-  char *basename = simple_basename(progpath);
-  if(strcmp(basename,"run_test") == 0 ||
-       strcmp(basename, "run_test.exe") == 0) {
-    printf("---***---\nDeprecated: run_test is deprecated and will be removed in R16B,\n            please use ct_run instead\n---***---\n");
-  }
-}
-
 static char*
 get_default_emulator(char* progname)
 {
diff --git a/erts/etc/common/erlc.c b/erts/etc/common/erlc.c
index aa04d62f5b..c2d7c7c76d 100644
--- a/erts/etc/common/erlc.c
+++ b/erts/etc/common/erlc.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1997-2012. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2013. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 577554c43d..9d674a7c65 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -912,6 +912,16 @@ int main(int argc, char **argv)
 			  i++;
 		      }
 		      break;
+		  case 'p':
+		      if (argv[i][2] != 'c' || argv[i][3] != '\0')
+			  goto the_default;
+		      if (i+1 >= argc)
+			  usage(argv[i]);
+		      argv[i][0] = '-';
+		      add_Eargs(argv[i]);
+		      add_Eargs(argv[i+1]);
+		      i++;
+		      break;
 		  case 'z':
 		      if (!is_one_of_strings(&argv[i][2], plusz_val_switches)) {
 			  goto the_default;
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index 2dcd070a6d..0f33258a28 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -2,7 +2,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2012. All Rights Reserved.
+# Copyright Ericsson AB 1996-2013. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -92,9 +92,6 @@ cp -p "$ERL_ROOT/erts-%I_VSN%/bin/typer" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/ct_run" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/escript" .
 
-# Remove in R16B
-ln -s ct_run run_test
-
 #
 # Set a soft link to epmd
 # This should not be done for an embedded system!
diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c
index d680b67dd6..dd02a9c111 100644
--- a/erts/etc/win32/Install.c
+++ b/erts/etc/win32/Install.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2003-2011. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2013. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -171,20 +171,6 @@ int main(int argc, char **argv)
 	    fprintf(stderr,"Continuing installation anyway...\n");
 	}
     }
-
-    // Remove in R16B
-    sprintf(fromname,"%s\\%s",bin_dir,"ct_run.exe");
-    sprintf(toname,"%s\\%s",bin_dir,"run_test.exe");
-    if (GetFileAttributes(fromname) == 0xFFFFFFFF) {
-      fprintf(stderr,"Could not find file %s\n",
-	      fromname);
-      exit(1);
-    }
-    if (!CopyFile(fromname,toname,FALSE)) {
-      fprintf(stderr,"Could not copy file %s to %s\n",
-	      fromname,toname);
-      fprintf(stderr,"Continuing installation anyway...\n");
-    }
     
     for (i = 0; scripts[i] != NULL; ++i) {
 	sprintf(fromname,"%s\\%s",release_dir,scripts[i]);