wip

Author: rdw-software

Runtime/Bindings/FFI/curl/curl.lua

@@ -355,7 +355,7 @@ struct static_curl_exports_table {
 	CURLcode (*curl_easy_recv)(CURL* handle, void* buffer, size_t buflen, size_t* n);
 	void (*curl_easy_reset)(CURL* handle);
 	CURLcode (*curl_easy_send)(CURL* handle, const void* buffer, size_t buflen, size_t* n);
-	CURLcode (*curl_easy_setopt)(CURL* handle, const struct curl_easyoption* option, ...);
+	CURLcode (*curl_easy_setopt)(CURL* handle, const struct curl_easyoption* option, va_list);
 	CURLcode (*curl_easy_ssls_import)(CURL* handle,
 		const char* session_key,
 		const unsigned char* shmac,
@@ -544,6 +544,17 @@ function curl.easy_init()
 	return handle
 end
 
+function curl.easy_setopt(handle, name, value)
+	local option = curl.bindings.curl_easy_option_by_name(name)
+	assert(option ~= ffi.NULL, "Invalid option name: " .. name) -- TBD
+
+	local status = curl.bindings.curl_easy_setopt(handle, option, value)
+	if status ~= ffi.C.CURLUE_OK then
+		-- return nil, curl.curl_easy_strerror(status) -- TBD
+	end
+
+	return status
+end
 function curl.free(pointer)
 	curl.bindings.curl_free(pointer)
 end

Runtime/Bindings/FFI/curl/curl_ffi.hpp

@@ -6,6 +6,11 @@
 typedef CURLU* url_ptr_t;
 typedef const CURLU* url_cptr_t;
 
+extern "C" {
+	#include "curl_exports.h"
+}
+
+
 // typedef enum {
 // 	/* This is the FILE * or void * the regular output should be written to. */
 // 	CURLOPT(CURLOPT_WRITEDATA, CURLOPTTYPE_CBPOINT, 1),
@@ -1124,8 +1129,6 @@ typedef const CURLU* url_cptr_t;
 // 	CURLOPT_LASTENTRY /* the last unused */
 //   } CURLoption;
 
-#include "curl_exports.h"
-
 namespace curl_ffi {
 	void* getExportsTable();
 }

Runtime/Libraries/bdd.lua

@@ -230,7 +230,7 @@ function bdd.startSubsection(label, testFunction)
 	end
 
 	local success, errorDetails = xpcall(testFunction, errorHandler)
-
+	print(success, errorDetails)
 	for _, teardownFunction in ipairs(bdd.registeredTeardownFunctions) do
 		teardownFunction()
 	end

Tests/BDD/curl-library.spec.lua

@@ -17,8 +17,8 @@ describe("curl", function()
 
 	describe("easy_setopt", function()
 		it("should be able to set the URL", function()
-			local easy = curl.easy_init()
-			assert(easy)
+			local easy = assert(curl.easy_init())
+			assert(curl.easy_setopt(easy, "url", "http://localhost:8080"))
 		end)
 	end)
 

Tests/SmokeTests/bdd-library/test-start-runner.lua

@@ -389,6 +389,10 @@ local function testSetupTeardownHookNestingCase()
 	_G.CALLSTACK = nil -- Is it a crime if there aren't any witnesses?
 end
 
+function testInvalidErrorDetailsAfterThrownException()
+
+end
+
 local function testStartTestRunner()
 	testNoFilesCase()
 	testInvalidFileCase()
@@ -407,6 +411,7 @@ local function testStartTestRunner()
 	testDetailedPassingTestCase()
 	testDetailedFailingTestCase()
 	testSetupTeardownHookNestingCase()
+	testInvalidErrorDetailsAfterThrownException()
 end
 
 testStartTestRunner()