test644: verify --xattr (with redirect)

diff --git a/src/tool_xattr.c b/src/tool_xattr.c
index 684aa939f83ac3a3791c2377cb8d74262cba82d1..bd0574996637e870d46bb2235fcd211f586367b9 100644 (file)
--- a/src/tool_xattr.c
+++ b/src/tool_xattr.c
@@ -22,17 +22,6 @@
  *
  ***************************************************************************/
 #include "tool_setup.h"
-
-#ifdef HAVE_FSETXATTR
-#  include <sys/xattr.h> /* header from libc, not from libattr */
-#  define USE_XATTR
-#elif (defined(__FreeBSD_version) && (__FreeBSD_version > 500000)) || \
-      defined(__MidnightBSD_version)
-#  include <sys/types.h>
-#  include <sys/extattr.h>
-#  define USE_XATTR
-#endif
-
 #include "tool_xattr.h"
 
 #include "memdebug.h" /* keep this as LAST include */
@@ -144,13 +133,4 @@ int fwrite_xattr(CURL *curl, const char *url, int fd)
   }
   return err;
 }
-#else
-int fwrite_xattr(CURL *curl, const char *url, int fd)
-{
-  (void)curl;
-  (void)url;
-  (void)fd;
-
-  return 0;
-}
 #endif

diff --git a/src/tool_xattr.h b/src/tool_xattr.h
index f107461a9043c7fc9df986850d8ad569beea0072..e85d4cded513bc824dfd2bd085a6e5213bcc2b50 100644 (file)
--- a/src/tool_xattr.h
+++ b/src/tool_xattr.h
@@ -25,6 +25,21 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
+#ifdef HAVE_FSETXATTR
+#  include <sys/xattr.h> /* header from libc, not from libattr */
+#  define USE_XATTR
+#elif (defined(__FreeBSD_version) && (__FreeBSD_version > 500000)) || \
+      defined(__MidnightBSD_version)
+#  include <sys/types.h>
+#  include <sys/extattr.h>
+#  define USE_XATTR
+#endif
+
+#ifdef USE_XATTR
 int fwrite_xattr(CURL *curl, const char *url, int fd);
 
+#else
+#define fwrite_xattr(a,b,c) 0
+#endif
+
 #endif /* HEADER_CURL_TOOL_XATTR_H */

diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index c42077211676ae088802ff31cb32c27377271683..464c2eb5e54eeb996e4f94e16d88951e6040e8f0 100644 (file)
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -447,6 +447,7 @@ Features testable here are:
 - `win32`
 - `wolfssh`
 - `wolfssl`
+- `xattr`
 
 as well as each protocol that curl supports. A protocol only needs to be
 specified if it is different from the server (useful when the server is

diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index b3727a6c6753004c4d3bbc1425820f9b309ca5ec..99dc92cb3b3ee4889b5f13a9a8b331a4c5b505b6 100644 (file)
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -91,7 +91,7 @@ test608 test609 test610 test611 test612 test613 test614 test615 test616 \
 test617 test618 test619 test620 test621 test622 test623 test624 test625 \
 test626 test627 test628 test629 test630 test631 test632 test633 test634 \
 test635 test636 test637 test638 test639 test640 test641 test642 \
-test643         test645 test646 test647 test648 test649 test650 test651 \
+test643 test644 test645 test646 test647 test648 test649 test650 test651 \
 test652 test653 test654 test655 test656 test658 test659 test660 test661 \
 test662 test663 test664 test665 test666 test667 test668 test669 \
 test670 test671 test672 test673 test674 test675 test676 test677 test678 \

diff --git a/tests/data/test644 b/tests/data/test644
new file mode 100644 (file)
index 0000000..c067d03
--- /dev/null
+++ b/tests/data/test644
@@ -0,0 +1,85 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+xattr
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 301 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: fake/data
+Funny-head: yesyes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
+
+-foo-
+</data>
+<data2 nocheck="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/real
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+</data2>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+<features>
+debug
+xattr
+</features>
+# simulate the xattr operations
+<setenv>
+CURL_FAKE_XATTR=1
+</setenv>
+<name>
+--xattr with redirect
+</name>
+<command>
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -L -o log/out%TESTNUMBER
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+GET /%TESTNUMBER HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
+Accept: */*\r
+\r
+GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
+Accept: */*\r
+\r
+</protocol>
+<stdout mode="text">
+user.mime_type => text/html
+user.xdg.origin.url => http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+</stdout>
+</verify>
+</testcase>

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 72cd2c353efdfc9f8e2d2d604c00ad402b341ba4..3f6197249a350b5b12ad0db83331e1c4b33795db 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2958,7 +2958,7 @@ sub setupfeatures {
     $feature{"verbose-strings"} = 1;
     $feature{"wakeup"} = 1;
     $feature{"headers-api"} = 1;
-
+    $feature{"xattr"} = 1;
 }
 
 #######################################################################

diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 1280423224eb5d08d3a53eac3686f595da5204d0..bad6edf4df2f2d031626ea119ed0b02c174d4e06 100644 (file)
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -36,6 +36,7 @@ function(SETUP_EXECUTABLE TEST_NAME)    # ARGN are the files in the test
     ${CURL_SOURCE_DIR}/lib      # To be able to reach "curl_setup_once.h"
     ${CURL_BINARY_DIR}/lib      # To be able to reach "curl_config.h"
     ${CURL_BINARY_DIR}/include  # To be able to reach "curl/curl.h"
+    ${CURL_SOURCE_DIR}/src      # To be able to reach "tool_xattr.h"
     )
   if(USE_ARES)
     include_directories(${CARES_INCLUDE_DIR})

diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 964fab2ac61700c31109998caa71a0c6cfcdf928..45ccf231d8ba2f7aa5395b577950b5cbbee9bd42 100644 (file)
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -36,6 +36,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib
 
+disabled_CPPFLAGS = $(AM_CPPFLAGS) \
+              -I$(top_srcdir)/src
+
 # Prevent LIBS from being used for all link targets
 LIBS = $(BLANK_AT_MAKETIME)
 

diff --git a/tests/server/disabled.c b/tests/server/disabled.c
index b9bc9b75f525157fc90cef2024176dbb5afc49e5..8a4a17ce5eb0eb2b88c8475da8e0fcd7b43ec339 100644 (file)
--- a/tests/server/disabled.c
+++ b/tests/server/disabled.c
@@ -33,6 +33,7 @@
 
 #include "curl_setup.h"
 #include "multihandle.h" /* for ENABLE_WAKEUP */
+#include "tool_xattr.h" /* for USE_XATTR */
 #include <stdio.h>
 
 static const char *disabled[]={
@@ -74,6 +75,9 @@ static const char *disabled[]={
 #endif
 #ifdef CURL_DISABLE_HEADERS_API
   "headers-api",
+#endif
+#ifndef USE_XATTR
+  "xattr",
 #endif
   NULL
 };