diff --git a/share/scons/get_xmlrpc_config b/share/scons/get_xmlrpc_config index ebbdd45b55..d89e721ed4 100755 --- a/share/scons/get_xmlrpc_config +++ b/share/scons/get_xmlrpc_config @@ -1,7 +1,8 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2010, OpenNebula Project Leads (OpenNebula.org) # +# Copyright 2002-2009, Distributed Systems Architecture Group, Universidad # +# Complutense de Madrid (dsa-research.org) # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -18,8 +19,7 @@ require 'pp' require 'digest/md5' -require 'ftools' - +require 'fileutils' ########################################### # Code to test compilation/linkning flags # @@ -207,7 +207,7 @@ def gen_test_file(kind) #fname="xmlrpc_test.cc" full_path=dir+"/"+fname - File.makedirs(dir) + FileUtils::mkdir_p(dir) f=open(full_path, "w") f.write(TestCode[kind]) f.close diff --git a/share/test/do_tests.sh b/share/test/do_tests.sh index 5bfedf7b97..55b6ca0d3d 100755 --- a/share/test/do_tests.sh +++ b/share/test/do_tests.sh @@ -78,7 +78,7 @@ elif [ "$VAL_CALL" = "yes" ] ; then CALLER="valgrind --tool=callgrind" fi -TESTS=`find $TWD_DIR -name test -type d` +TESTS=`find $TWD_DIR -name test -type d | grep -v ruby` for i in $TESTS ; do cd $BASE_DIR diff --git a/src/image/test/SConstruct b/src/image/test/SConstruct index bf11121dbb..34f67f44a3 100644 --- a/src/image/test/SConstruct +++ b/src/image/test/SConstruct @@ -51,6 +51,7 @@ main_env.Append(LIBPATH=[ cwd + '/src/mad', cwd + '/src/vnm', cwd + '/src/um', + cwd + '/src/authm', cwd + '/src/image', '/usr/include/openssl/', ]) @@ -59,11 +60,12 @@ main_env.Append(LIBS=[ 'nebula_image', 'nebula_um', 'nebula_vm', - 'nebula_mad', 'nebula_hm', 'nebula_vnm', + 'nebula_authm', 'nebula_template', 'nebula_pool', + 'nebula_mad', 'nebula_common', 'nebula_log', 'nebula_core', diff --git a/src/um/test/SConstruct b/src/um/test/SConstruct index 2b6eb98931..fcce418e74 100644 --- a/src/um/test/SConstruct +++ b/src/um/test/SConstruct @@ -41,10 +41,12 @@ main_env.Append(CPPPATH=[ # Library dirs main_env.Append(LIBPATH=[ cwd + '/src/common', + cwd + '/src/mad', cwd + '/src/log', cwd + '/src/nebula', cwd + '/src/pool', cwd + '/src/sql', + cwd + '/src/authm', cwd + '/src/um', '/usr/include/openssl/', ]) @@ -53,7 +55,9 @@ main_env.Append(LIBS=[ 'nebula_um', 'nebula_pool', 'nebula_log', + 'nebula_authm', 'nebula_common', + 'nebula_mad', 'nebula_core', 'nebula_sql', 'cppunit', diff --git a/src/vm/test/SConstruct b/src/vm/test/SConstruct index 9124675c1b..362a0dd4ea 100644 --- a/src/vm/test/SConstruct +++ b/src/vm/test/SConstruct @@ -48,6 +48,7 @@ main_env.Append(LIBPATH=[ cwd + '/src/template', cwd + '/src/vm', cwd + '/src/hm', + cwd + '/src/authm', cwd + '/src/mad', cwd + '/src/vnm', cwd + '/src/um', @@ -58,12 +59,13 @@ main_env.Append(LIBPATH=[ main_env.Append(LIBS=[ 'nebula_um', 'nebula_vm', - 'nebula_mad', 'nebula_hm', 'nebula_vnm', + 'nebula_authm', 'nebula_template', 'nebula_pool', 'nebula_image', + 'nebula_mad', 'nebula_common', 'nebula_log', 'nebula_core', diff --git a/src/vnm/test/SConstruct b/src/vnm/test/SConstruct index 221228318e..811f856d6b 100644 --- a/src/vnm/test/SConstruct +++ b/src/vnm/test/SConstruct @@ -40,7 +40,9 @@ main_env.Append(CPPPATH=[ # Library dirs main_env.Append(LIBPATH=[ + cwd + '/src/authm', cwd + '/src/common', + cwd + '/src/mad', cwd + '/src/nebula', cwd + '/src/sql', cwd + '/src/log', @@ -54,9 +56,11 @@ main_env.Append(LIBS=[ 'nebula_log', 'nebula_um', 'nebula_vnm', + 'nebula_authm', 'nebula_template', 'nebula_pool', 'nebula_common', + 'nebula_mad', 'nebula_core', 'nebula_sql', 'cppunit',