chore(test): conditionally exclude block commit api

Needed to run the tests against older versions of libvirt, this also fixes the build on node 0.10.x/0.12.x.
hooklift · Aug 23, 2016 · e699aba · e699aba
1 parent 92302ba
commit e699aba
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/src/domain.cc b/src/domain.cc
@@ -122,10 +122,12 @@ void Domain::Initialize(Handle<Object> exports)
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA);
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_SNAPSHOT_CREATE_HALT);
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY);
+  #if LIBVIR_CHECK_VERSION(0,9,10)
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT);
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE);
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC);
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_SNAPSHOT_CREATE_LIVE);
+  #endif
 
   //virDomainSnapshotDelete
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN);
@@ -137,6 +139,7 @@ void Domain::Initialize(Handle<Object> exports)
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_AFFECT_LIVE);
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_AFFECT_CONFIG);
 
+#ifdef _HAVE_DOMAIN_BLOCKCOMMIT_API
   //virDomainBlockCommit
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_BLOCK_COMMIT_SHALLOW);
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_BLOCK_COMMIT_DELETE);
@@ -155,6 +158,7 @@ void Domain::Initialize(Handle<Object> exports)
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_BLOCK_JOB_TYPE_COPY);
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT);
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT);
+#endif
 
   //virDomainXMLFlags
   NODE_DEFINE_CONSTANT(exports, VIR_DOMAIN_XML_SECURE);
@@ -1524,6 +1528,9 @@ NLV_WORKER_EXECUTE(Domain, SetVcpus)
 #include <unistd.h>
 NAN_METHOD(Domain::BlockCommit)
 {
+  #ifndef _HAVE_DOMAIN_BLOCKCOMMIT_API
+  Nan::ThrowTypeError("blockcommit api not supported in this libvirt version");
+  #else
   Nan::HandleScope scope;
   if (info.Length() < 5 || !info[0]->IsString() || !info[1]->IsString() || !info[2]->IsString()
       || !info[3]->IsNumber()) {
@@ -1544,10 +1551,14 @@ NAN_METHOD(Domain::BlockCommit)
     }
     return onFinished(PrimitiveReturnHandler(true));
   });
+  #endif
 }
 
 NAN_METHOD(Domain::BlockJobInfo)
 {
+  #ifndef _HAVE_DOMAIN_BLOCKCOMMIT_API
+  Nan::ThrowTypeError("blockcommit api not supported in this libvirt version");
+  #else
   Nan::HandleScope scope;
   if (info.Length() < 1 || !info[0]->IsString()) {
     Nan::ThrowTypeError("you must specify path and optionally flags");
@@ -1579,10 +1590,14 @@ NAN_METHOD(Domain::BlockJobInfo)
       callback->Call(2, argv);
     });
   });
+  #endif
 }
 
 NAN_METHOD(Domain::BlockJobAbort)
 {
+  #ifndef _HAVE_DOMAIN_BLOCKCOMMIT_API
+  Nan::ThrowTypeError("blockcommit api not supported in this libvirt version");
+  #else
   if (info.Length() < 1 || !info[0]->IsString()) {
     Nan::ThrowTypeError("you must specify path and optionally flags");
     return;
@@ -1600,6 +1615,7 @@ NAN_METHOD(Domain::BlockJobAbort)
     }
     return onFinished(PrimitiveReturnHandler(true));
   });
+  #endif
 }
 
 NAN_METHOD(Domain::SendKeys)

diff --git a/src/domain.h b/src/domain.h
@@ -10,6 +10,7 @@
 
 #if LIBVIR_CHECK_VERSION(0,9,10)
 #define _HAVE_DOMAIN_METADATA_API 1
+#define _HAVE_DOMAIN_BLOCKCOMMIT_API 1
 #endif
 
 namespace NLV {

diff --git a/src/nlv_object.h b/src/nlv_object.h
@@ -102,7 +102,7 @@ NAN_INLINE void AsyncQueueWorker(Nan::AsyncWorker *worker, Local<Object> parent
   Nan::AsyncQueueWorker(worker);
 }
 
-NAN_INLINE unsigned int GetFlags(v8::Handle<v8::Value> val) {
+NAN_INLINE unsigned int GetFlags(v8::Local<v8::Value> val) {
   if(val->IsUndefined() || val->IsFunction()) {
     return 0;
   }

diff --git a/src/worker.cc b/src/worker.cc
@@ -2,7 +2,7 @@
 
 using namespace NLV;
 
-void Worker::Queue(v8::Handle<v8::Value> v8_callback, ExecuteHandler handler) {
+void Worker::Queue(v8::Local<v8::Value> v8_callback, ExecuteHandler handler) {
   if(!v8_callback->IsFunction()) {
     Nan::ThrowTypeError("you must specify a function as the callback");;
     return;

diff --git a/src/worker.h b/src/worker.h
@@ -31,7 +31,7 @@ namespace NLV {
 
     // TODO: make it a template so that it can accept arbitrary number of arguments
     // of objects to make persistent for the duration of the worker run
-    static void Queue(v8::Handle<v8::Value> v8_callback, ExecuteHandler handler);
+    static void Queue(v8::Local<v8::Value> v8_callback, ExecuteHandler handler);
   };
 
   template<class T>