Check-in [a6c35050af]
Overview
Comment:Updated to not do curl tests if cross-compiling
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a6c35050af706a5c3fe0c7def009588691dd19ce
User & Date: rkeene on 2014-06-23 20:31:37
Other Links: manifest | tags
Context
2014-06-23
20:35
Updated to include build tests for FreeBSD check-in: 7986e3289d user: rkeene tags: trunk
20:31
Updated to not do curl tests if cross-compiling check-in: a6c35050af user: rkeene tags: trunk
20:29
Updated to not try to use dlopen() on PE platforms check-in: c3a3ac9cbf user: rkeene tags: trunk
Changes

Modified test.tcl from [e367198f71] to [c0aa27fcc2].

   112    112   	$handle go
   113    113   	load $tmpfile myPkg
   114    114   	puts [ext_add 1 42]
   115    115   	file delete $tmpfile
   116    116   }
   117    117   
   118    118   # More involved test
   119         -set handle [tcc4tcl::new]
   120         -$handle ccode {
          119  +if {[info exists ::env(TCC4TCL_TEST_RUN_NATIVE)]} {
          120  +	set handle [tcc4tcl::new]
          121  +	$handle ccode {
   121    122   #include <stdint.h>
   122    123   #include <curl/curl.h>
   123    124   }
   124         -$handle cwrap curl_version {} vstring
   125         -$handle cproc curl_fetch {char* url} ok {
   126         -	void *handle;
          125  +	$handle cwrap curl_version {} vstring
          126  +	$handle cproc curl_fetch {char* url} ok {
          127  +		void *handle;
   127    128   
   128         -	handle = curl_easy_init();
   129         -	if (!handle) {
   130         -		return(TCL_ERROR);
   131         -	}
          129  +		handle = curl_easy_init();
          130  +		if (!handle) {
          131  +			return(TCL_ERROR);
          132  +		}
   132    133   
   133         -	curl_easy_setopt(handle, CURLOPT_URL, url);
   134         -	curl_easy_perform(handle);
          134  +		curl_easy_setopt(handle, CURLOPT_URL, url);
          135  +		curl_easy_perform(handle);
   135    136   
   136         -	return(TCL_OK);
   137         -}
   138         -$handle add_include_path /usr/include
   139         -$handle add_library_path /usr/lib64
   140         -$handle add_library_path /usr/lib
   141         -$handle add_library_path /usr/lib32
   142         -$handle add_library curl
   143         -$handle go
          137  +		return(TCL_OK);
          138  +	}
          139  +	$handle add_include_path /usr/include
          140  +	$handle add_library_path /usr/lib64
          141  +	$handle add_library_path /usr/lib
          142  +	$handle add_library_path /usr/lib32
          143  +	$handle add_library curl
          144  +	$handle go
   144    145       
   145         -curl_fetch http://rkeene.org/
          146  +	curl_fetch http://rkeene.org/
          147  +}