OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0027713: Test bugs fclasses bug6143 is not OK for Linux after restoring FPS (26329)

Browse Source 
Use standard (POSIX-compliant) macro "__linux__" for identification of Linux system, instead of obsolete "linux"
This commit is contained in:
abv 2016-08-29 06:22:44 +03:00 committed by kgv
parent f4dee9bb20
commit c381fda2d6
6 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OSD/OSD_Chronometer.cxx
View File

@ -57,7 +57,7 @@
//======================================================================= //=======================================================================
void OSD_Chronometer::GetProcessCPU (Standard_Real& UserSeconds, Standard_Real& SystemSeconds) void OSD_Chronometer::GetProcessCPU (Standard_Real& UserSeconds, Standard_Real& SystemSeconds)
{ {
#if defined(__linux__) || defined(linux) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__QNX__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__QNX__)
static const long aCLK_TCK = sysconf(_SC_CLK_TCK); static const long aCLK_TCK = sysconf(_SC_CLK_TCK);
#else #else
static const long aCLK_TCK = CLK_TCK; static const long aCLK_TCK = CLK_TCK;

10
src/OSD/OSD_signal.cxx
View File

@ -615,7 +615,7 @@ LONG _osd_debug ( void ) {
// POSIX threads // POSIX threads
#include <pthread.h> #include <pthread.h>
#ifdef linux #ifdef __linux__
#include <fenv.h> #include <fenv.h>
static Standard_Boolean fFltExceptions = Standard_False; static Standard_Boolean fFltExceptions = Standard_False;
#endif #endif
@ -798,7 +798,7 @@ static void Handler (const int theSignal)
// cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ; // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ;
if ( ADR_ACT_SIGIO_HANDLER != NULL ) if ( ADR_ACT_SIGIO_HANDLER != NULL )
(*ADR_ACT_SIGIO_HANDLER)() ; (*ADR_ACT_SIGIO_HANDLER)() ;
#ifdef linux #ifdef __linux__
if (fFltExceptions) if (fFltExceptions)
feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
//feenableexcept (FE_INVALID | FE_DIVBYZERO); //feenableexcept (FE_INVALID | FE_DIVBYZERO);
@ -922,7 +922,7 @@ static void SegvHandler(const int theSignal,
(void)theSignal; // silence GCC warnings (void)theSignal; // silence GCC warnings
(void)theContext; (void)theContext;
#endif #endif
#ifdef linux #ifdef __linux__
if (fFltExceptions) if (fFltExceptions)
feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
//feenableexcept (FE_INVALID | FE_DIVBYZERO); //feenableexcept (FE_INVALID | FE_DIVBYZERO);
@ -1009,7 +1009,7 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal)
cerr << "ieee_handler does not work !!! KO " << endl; cerr << "ieee_handler does not work !!! KO " << endl;
#endif #endif
} }
#elif defined (linux) #elif defined (__linux__)
feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
//feenableexcept (FE_INVALID | FE_DIVBYZERO); //feenableexcept (FE_INVALID | FE_DIVBYZERO);
fFltExceptions = Standard_True; fFltExceptions = Standard_True;
@ -1096,7 +1096,7 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal)
sigaction(SIGBUS,&oact,&oact); sigaction(SIGBUS,&oact,&oact);
#endif #endif
#if (!defined (linux)) && (!defined(__linux__)) #if !defined(__linux__)
sigaction(SIGSYS,&act,&oact); // ...... bad argument to system call sigaction(SIGSYS,&act,&oact); // ...... bad argument to system call
# ifdef OBJS # ifdef OBJS

2
src/QABugs/QABugs_11.cxx
View File

@ -2452,7 +2452,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co
} }
catch(Standard_NumericError) // Linux, Windows with SSE2 catch(Standard_NumericError) // Linux, Windows with SSE2
{ {
di << "Exception is caught, OK\n"; di << "Caught, OK\n";
} }
catch(Standard_Failure) { catch(Standard_Failure) {
//cout << " Caught (" << Standard_Failure::Caught() << ")... KO" << endl; //cout << " Caught (" << Standard_Failure::Caught() << ")... KO" << endl;

2
src/Standard/Standard_MMgrOpt.cxx
View File

@ -249,7 +249,7 @@ void Standard_MMgrOpt::Initialize()
perror("ERR_MEMRY_FAIL"); perror("ERR_MEMRY_FAIL");
#endif #endif
#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(linux) || defined(__FreeBSD__) || defined(__ANDROID__) #if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__)
if ((myMMap = open ("/dev/zero", O_RDWR)) < 0) { if ((myMMap = open ("/dev/zero", O_RDWR)) < 0) {
if ((myMMap = open ("/dev/null", O_RDWR)) < 0){ if ((myMMap = open ("/dev/null", O_RDWR)) < 0){
myMMap = 0; myMMap = 0;

5
tests/bugs/fclasses/bug6143
View File

@ -1,6 +1,4 @@
puts "TODO OCC24156 MacOS: Faulty OCC6143" puts "TODO OCC24156 MacOS: Faulty OCC6143"
puts "TODO OCC27713 Linux: Faulty OCC6143"
puts "TODO OCC27713 Linux: Error"
puts "================" puts "================"
puts "OCC1723" puts "OCC1723"
@ -10,8 +8,7 @@ puts "OCC12131"
puts "================" puts "================"
puts "" puts ""
####################################################################################### #######################################################################################
# OSD::SetSignal : not all FLT exceptions are catched # OSD::SetSignal : not all FLT exceptions are caught
# Correct handling of exceptions on WNT
####################################################################################### #######################################################################################
pload QAcommands pload QAcommands

7
tests/bugs/modalg_6/bug27842 Normal file → Executable file
View File

@ -6,12 +6,7 @@ puts ""
# Exception in intersection algorithm if FPE is switched on # Exception in intersection algorithm if FPE is switched on
###################################################### ######################################################
puts "TODO OCC26329 ALL: Error: dsetsignal command does not exist" dsetsignal 1
# This "if" should be deleted after integration the fix for issue #26329
if { [catch { dsetsignal 1 } ] } {
puts "Error: dsetsignal command does not exist"
}
restore [locate_data_file bug27842_shape1_fix.brep] b1 restore [locate_data_file bug27842_shape1_fix.brep] b1
restore [locate_data_file bug27842_shape2_fix.brep] b2 restore [locate_data_file bug27842_shape2_fix.brep] b2