From 266e32412752dd8f4892a460638eeedeeafdd788 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Fri, 22 Feb 2013 10:51:42 +0100 Subject: Remove the deprecated run_test start program It was replaced by ct_run in R14B. --- Makefile.in | 2 +- erts/Makefile.in | 3 --- erts/etc/common/ct_run.c | 12 ------------ erts/etc/unix/Install.src | 3 --- erts/etc/win32/Install.c | 14 -------------- 5 files changed, 1 insertion(+), 33 deletions(-) diff --git a/Makefile.in b/Makefile.in index e5909aa7f0..75ac07afc1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -124,7 +124,7 @@ BINDIR = $(DESTDIR)$(EXTRA_PREFIX)$(bindir) # # Erlang base public files # -ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer typer escript ct_run run_test +ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer typer escript ct_run # ERLANG_INST_LIBDIR is the top directory where the Erlang installation # will be located when running. diff --git a/erts/Makefile.in b/erts/Makefile.in index 0bcb784972..51aee98a05 100644 --- a/erts/Makefile.in +++ b/erts/Makefile.in @@ -74,14 +74,12 @@ local_setup: $(ERL_TOP)/bin/escript $(ERL_TOP)/bin/escript.exe \ $(ERL_TOP)/bin/dialyzer $(ERL_TOP)/bin/dialyzer.exe \ $(ERL_TOP)/bin/typer $(ERL_TOP)/bin/typer.exe \ - $(ERL_TOP)/bin/run_test $(ERL_TOP)/bin/run_test.exe \ $(ERL_TOP)/bin/ct_run $(ERL_TOP)/bin/ct_run.exe \ $(ERL_TOP)/bin/start*.boot $(ERL_TOP)/bin/start*.script @if [ "X$(TARGET)" = "Xwin32" ]; then \ cp $(ERL_TOP)/bin/$(TARGET)/dialyzer.exe $(ERL_TOP)/bin/dialyzer.exe; \ cp $(ERL_TOP)/bin/$(TARGET)/typer.exe $(ERL_TOP)/bin/typer.exe; \ cp $(ERL_TOP)/bin/$(TARGET)/ct_run.exe $(ERL_TOP)/bin/ct_run.exe; \ - cp $(ERL_TOP)/bin/$(TARGET)/ct_run.exe $(ERL_TOP)/bin/run_test.exe; \ cp $(ERL_TOP)/bin/$(TARGET)/erlc.exe $(ERL_TOP)/bin/erlc.exe; \ cp $(ERL_TOP)/bin/$(TARGET)/erl.exe $(ERL_TOP)/bin/erl.exe; \ cp $(ERL_TOP)/bin/$(TARGET)/werl.exe $(ERL_TOP)/bin/werl.exe; \ @@ -102,7 +100,6 @@ local_setup: cp $(ERL_TOP)/bin/$(TARGET)/dialyzer $(ERL_TOP)/bin/dialyzer; \ cp $(ERL_TOP)/bin/$(TARGET)/typer $(ERL_TOP)/bin/typer; \ cp $(ERL_TOP)/bin/$(TARGET)/ct_run $(ERL_TOP)/bin/ct_run; \ - ln -s $(ERL_TOP)/bin/ct_run $(ERL_TOP)/bin/run_test; \ cp $(ERL_TOP)/bin/$(TARGET)/erlc $(ERL_TOP)/bin/erlc; \ cp $(ERL_TOP)/bin/$(TARGET)/escript $(ERL_TOP)/bin/escript; \ chmod 755 $(ERL_TOP)/bin/erl $(ERL_TOP)/bin/erlc \ 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]); -- cgit v1.2.3