summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@psysamsungtop.(none)>2012-12-24 00:41:30 (GMT)
committer root <root@psysamsungtop.(none)>2012-12-24 00:41:30 (GMT)
commitdf0ad217ed0601b4d80da5bc8cbf4eb2cd0c73fc (patch)
tree9bd047df2ab701918475e37ca8a5203e6c11ba9c
parent0aacad7e3d892364d35a0838c4786df5175080ea (diff)
fix for arm selftest
-rw-r--r--cvar.cpp5
-rw-r--r--modules/mp.module/CMakeLists.txt28
2 files changed, 3 insertions, 30 deletions
diff --git a/cvar.cpp b/cvar.cpp
index 07c516d..af64d66 100644
--- a/cvar.cpp
+++ b/cvar.cpp
@@ -639,8 +639,9 @@ bool Cvar::selfTest()
DEB("test: long to string");
a=6.14;
- TEST((string)a=="6.13999999999999968026");
- TEST(a.str()=="6.13999999999999968026");
+ //actual value depends on the architecture you use, on arm its 6.1399999999999997
+ TEST((string)a=="6.13999999999999968026" || (string)a=="6.1399999999999997");
+ TEST(a.str()=="6.13999999999999968026" || a.str()=="6.1399999999999997");
DEB("test: long to map");
a=7;
diff --git a/modules/mp.module/CMakeLists.txt b/modules/mp.module/CMakeLists.txt
deleted file mode 100644
index bdc27da..0000000
--- a/modules/mp.module/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#this is just a basic CMakeLists.txt, for more information see the cmake manpage
-
-cmake_minimum_required(VERSION 2.6)
-
-#add definitions, compiler switches, etc.
-ADD_DEFINITIONS()
-
-#Determine name of the .so module:
-#A module should always be in a modulename.module directory!.
-string(REGEX REPLACE ".*/([^/]*).module$" "\\1" module_name "${CMAKE_CURRENT_BINARY_DIR}")
-MESSAGE(STATUS "Module name of ${CMAKE_CURRENT_BINARY_DIR} is: '${module_name}'")
-
-#automaticly add all sourcefiles to current module
-file(GLOB sources *.cpp)
-ADD_LIBRARY(${module_name} MODULE ${sources})
-
-#need to link to some other libraries ? just add them here
-TARGET_LINK_LIBRARIES(${module_name})
-
-INCLUDE_DIRECTORIES(../..)
-
-#add an install target here
-#INSTALL_FILES(...)
-#INSTALL_PROGRAMS(...)
-#INSTALL_TARGET(...)
-
-
-