aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2010-01-14 15:38:49 +0000
committerErlang/OTP <[email protected]>2010-01-14 15:38:49 +0000
commit081f1bfa236db9346b435478f55d71fc71317fbc (patch)
treec95b802a65b74e9b76eaca5928e9345dc6a4bd68
parent069ba91e7c6811d25e4ba3b53b3086bf5b8a7aba (diff)
downloadotp-081f1bfa236db9346b435478f55d71fc71317fbc.tar.gz
otp-081f1bfa236db9346b435478f55d71fc71317fbc.tar.bz2
otp-081f1bfa236db9346b435478f55d71fc71317fbc.zip
OTP-8016, OTP-8056, OTP-8103, OTP-8106, OTP-8312, OTP-8315, OTP-8327, OTP-8349,
OTP-8351, OTP-8359 & OTP-8371.
-rw-r--r--lib/inets/doc/src/notes.xml4
-rw-r--r--lib/inets/test/Makefile10
l---------lib/inets/test/Makefile.src1
3 files changed, 2 insertions, 13 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 10c91949b4..ed83708940 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -135,7 +135,7 @@
<list>
<item>
<p>[httpd] The server did not fully support the documented module
- callback api. Spicifically, the load function should be able to
+ callback api. Specifically, the load function should be able to
return the atom <c>ok</c>, but this was not accepted. </p>
<p>Own Id: OTP-8359</p>
</item>
@@ -269,7 +269,7 @@
<p>Timeout out requests are retried. </p>
</item>
</list>
- <p>Jean-S�bastien P�dron</p>
+ <p>Jean-S&#233;bastien P&#233;dron</p>
<p>Own Id: OTP-8248</p>
</item>
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index 1dd7a51717..668752da9e 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -235,9 +235,6 @@ RELTESTSYSDIR = $(RELEASE_PATH)/inets_test
RELTESTSYSALLDATADIR = $(RELTESTSYSDIR)/all_SUITE_data
RELTESTSYSBINDIR = $(RELTESTSYSALLDATADIR)/bin
-MAKEFILE_SRC = Makefile.src
-INETS_SSL_LIB_DIR = ../../ssl/usr/ssleay/
-
# ----------------------------------------------------
# FLAGS
@@ -253,8 +250,6 @@ ERL_COMPILE_FLAGS += -pa ../../../internal_tools/test_server/ebin \
# If you intend to run the test suite locally (private), then
# there is some requirements:
# 1) INETS_PRIV_DIR must be created
-# 2) INETS_SSL_LIB_DIR must be created with the same content as
-# content comparable to all_SUITE_data/bin (see test-server).
# ----------------------------------------------------
tests debug opt: $(BUILDTARGET)
@@ -306,13 +301,9 @@ release_tests_spec: opt
chmod -f -R u+w $(RELTESTSYSDIR)
tar chf - $(DATADIRS) | (cd $(RELTESTSYSDIR); tar xf -)
$(INSTALL_DIR) $(RELTESTSYSALLDATADIR)
- $(INSTALL_DATA) $(MAKEFILE_SRC) $(RELTESTSYSALLDATADIR)/Makefile.src
$(INSTALL_DIR) $(RELTESTSYSBINDIR)
chmod -f -R +x $(RELTESTSYSBINDIR)
- tar cf - -C $(INETS_SSL_LIB_DIR) . | (cd $(RELTESTSYSALLDATADIR); tar xf -)
$(INSTALL_DIR) $(RELTESTSYSALLDATADIR)/win32/lib
- tar cf - -C $(INETS_SSL_LIB_DIR)/win32/out32dll . | \
- (cd $(RELTESTSYSALLDATADIR)/win32/lib; tar xf -)
release_docs_spec:
@@ -340,7 +331,6 @@ info:
@echo ""
@echo "INETS_DATA_DIR = $(INETS_DATA_DIR)"
@echo "INETS_PRIV_DIR = $(INETS_PRIV_DIR)"
- @echo "INETS_SSL_LIB_DIR = $(INETS_SSL_LIB_DIR)"
@echo "INETS_ROOT = $(INETS_ROOT)"
@echo "INETS_FLAGS = $(INETS_FLAGS)"
@echo "FTP_FLAGS = $(FTP_FLAGS)"
diff --git a/lib/inets/test/Makefile.src b/lib/inets/test/Makefile.src
deleted file mode 120000
index f361bfce20..0000000000
--- a/lib/inets/test/Makefile.src
+++ /dev/null
@@ -1 +0,0 @@
-../../ssl/test/Makefile.src \ No newline at end of file