aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-02-22 10:51:42 +0100
committerLukas Larsson <[email protected]>2013-02-22 10:51:42 +0100
commit266e32412752dd8f4892a460638eeedeeafdd788 (patch)
tree7d7b3efeeda019cf11c00d1b46c48f43b87118e2 /erts/etc
parent348178af5a16329b2030604fa79bd3f9c1048ff0 (diff)
downloadotp-266e32412752dd8f4892a460638eeedeeafdd788.tar.gz
otp-266e32412752dd8f4892a460638eeedeeafdd788.tar.bz2
otp-266e32412752dd8f4892a460638eeedeeafdd788.zip
Remove the deprecated run_test start program
It was replaced by ct_run in R14B.
Diffstat (limited to 'erts/etc')
-rw-r--r--erts/etc/common/ct_run.c12
-rw-r--r--erts/etc/unix/Install.src3
-rw-r--r--erts/etc/win32/Install.c14
3 files changed, 0 insertions, 29 deletions
diff --git a/erts/etc/common/ct_run.c b/erts/etc/common/ct_run.c
index 7aaab716f7..02a026c0fe 100644
--- a/erts/etc/common/ct_run.c
+++ b/erts/etc/common/ct_run.c
@@ -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/unix/Install.src b/erts/etc/unix/Install.src
index 2dcd070a6d..53836449b3 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -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..d0c69679f1 100644
--- a/erts/etc/win32/Install.c
+++ b/erts/etc/win32/Install.c
@@ -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]);