Changeset 19858

Timestamp:

09/25/08 01:47:33 (5 years ago)

Author:

tokuhirom

Message:

dry

Location:

lang/cplusplus/llv8call/trunk

Files:

• ext/SConscript (modified) (1 diff)
• t/010_nspr/00_simple.js (modified) (1 diff)
• t/010_nspr/01_file.js (modified) (1 diff)
• t/010_nspr/02_pipe.js (modified) (1 diff)
• t/010_nspr/03_getenv.js (modified) (1 diff)
• t/010_nspr/05_dir.js (modified) (1 diff)
• t/010_nspr/07_socket.js (modified) (1 diff)
• t/010_nspr/08_dll.js (modified) (1 diff)
• t/010_nspr/08_sys.js (modified) (1 diff)
• t/010_nspr/09_tcpsock.js (modified) (1 diff)
• t/020_ext/02_urlfetch.js (modified) (1 diff)
• t/020_ext/04_memcached.js (modified) (1 diff)
• t/020_ext/06_sqlite.js (modified) (1 diff)
• t/util.js (modified) (2 diffs)

lang/cplusplus/llv8call/trunk/ext/SConscript

@@ -10 +10 @@
 env.Append(
     CCFLAGS = ['-DUSING_V8_SHARED'],
-    CPPPATH = ['../../v8/include/', '../../src/', '/opt/local/include/'],
+    CPPPATH = ['../../src/', '/opt/local/include/'],
     LIBPATH = ['../../v8/'],
 )

lang/cplusplus/llv8call/trunk/t/010_nspr/00_simple.js

@@ -3 +3 @@
 var test = new Test.Builder;
 test.plan({tests : 1});
-load_lib("org.coderepos.nspr");
+
 test.ok(1);
 

lang/cplusplus/llv8call/trunk/t/010_nspr/01_file.js

@@ -2 +2 @@
 
 Test.More.plan({tests : 23});
-load_lib("org.coderepos.nspr");
+
 
 // setup

lang/cplusplus/llv8call/trunk/t/010_nspr/02_pipe.js

@@ -2 +2 @@
 
 Test.More.plan({tests : 1});
-load_lib("org.coderepos.nspr");
+
 
 var pipe = IO.CreatePipe();

lang/cplusplus/llv8call/trunk/t/010_nspr/03_getenv.js

@@ -2 +2 @@
 
 Test.More.plan({tests:2});
-load_lib("org.coderepos.nspr");
+
 var path = Sys.getenv("PATH").split(Sys.getenv("WINDOWS") ? ";" : ":");
 Test.More.ok(typeof(path.length) === 'number');

lang/cplusplus/llv8call/trunk/t/010_nspr/05_dir.js

@@ -2 +2 @@
 
 Test.More.plan({tests : 3});
-load_lib("org.coderepos.nspr");
+
 
 var d = new Dir("t");

lang/cplusplus/llv8call/trunk/t/010_nspr/07_socket.js

@@ -2 +2 @@
 
 Test.More.plan({tests : 1});
-load_lib("org.coderepos.nspr");
+
 
 // tcp socket

lang/cplusplus/llv8call/trunk/t/010_nspr/08_dll.js

@@ -2 +2 @@
 
 Test.More.plan({tests:2});
-load_lib("org.coderepos.nspr");
+
 DLL.SetLibraryPath("ext/");
 Test.More.is(DLL.GetLibraryPath(), 'ext/');

lang/cplusplus/llv8call/trunk/t/010_nspr/08_sys.js

@@ -2 +2 @@
 
 Test.More.plan({tests : 3});
-load_lib("org.coderepos.nspr");
+
 
 // sleep

lang/cplusplus/llv8call/trunk/t/010_nspr/09_tcpsock.js

@@ -1 +1 @@
 require('t/util.js');
 
-load_lib("org.coderepos.nspr");
+
 check_lib("org.coderepos.posix");
 

lang/cplusplus/llv8call/trunk/t/020_ext/02_urlfetch.js

@@ -2 +2 @@
 
 Test.More.plan({tests:1});
-load_lib("org.coderepos.nspr");
+
 
 check_lib("org.coderepos.curl");

lang/cplusplus/llv8call/trunk/t/020_ext/04_memcached.js

@@ -3 +3 @@
 Test.More.plan({tests:14});
 
-load_lib("org.coderepos.nspr");
+
 check_lib('org.coderepos.memcached');
 

lang/cplusplus/llv8call/trunk/t/020_ext/06_sqlite.js

@@ -3 +3 @@
 Test.More.plan({tests:8});
 
-load_lib("org.coderepos.nspr");
+
 check_lib("org.coderepos.sqlite3");
 

lang/cplusplus/llv8call/trunk/t/util.js

@@ -4 +4 @@
 require("t/Test.Simple/Test/Builder.js");
 require("t/Test.Simple/Test/More.js");
+
+DLL.SetLibraryPath("blib/");
+DLL.LoadLibrary( DLL.GetLibraryName(DLL.GetLibraryPath(), "org.coderepos.nspr") );
+
 File.isFile = function (path) {
     try {
@@ -12 +16 @@
         return false;
     };
-}
-
-function load_lib(libname) {
-    DLL.SetLibraryPath("blib/");
-    DLL.LoadLibrary( DLL.GetLibraryName(DLL.GetLibraryPath(), libname) );
 }