Skip to content

Commit

Permalink
Disable WITH_SYNCHRO in pthreads tests under emscripten (#7)
Browse files Browse the repository at this point in the history 
This feature of the test suite depends in sending signals between
threads using kill/raise.  Previously the threads setup to do this would
exit early becuase `kill()` would return non-zero, and would call
UNRESOLVED.

This change allows more tests to pass, but should be reverted once we
get inter-thread signal working.

See emscripten-core/emscripten#14892
  • Loading branch information
@sbc100
sbc100 committed Aug 17, 2021
1 parent a5e7ff5 commit 869e266
Show file tree
Hide file tree
Showing 18 changed files with 55 additions and 1 deletion.
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_atfork/3-3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif

/******************************************************************************/
/***************************** Test case *********************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_cancel/5-2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif


/********************************************************************************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_cond_broadcast/4-2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@
/********************************************************************************************/
/********************************** Configuration ******************************************/
/********************************************************************************************/
#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif
#ifndef VERBOSE
#define VERBOSE 2
#endif
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_cond_init/4-2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@
/********************************************************************************************/
/********************************** Configuration ******************************************/
/********************************************************************************************/
#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif
#ifndef VERBOSE
#define VERBOSE 2
#endif
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_cond_signal/4-2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@
/********************************************************************************************/
/********************************** Configuration ******************************************/
/********************************************************************************************/
#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif
#ifndef VERBOSE
#define VERBOSE 2
#endif
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_cond_timedwait/4-3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
/********************************************************************************************/
/********************************** Configuration ******************************************/
/********************************************************************************************/
#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif
#ifndef VERBOSE
#define VERBOSE 2
#endif
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_cond_wait/4-1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@
/********************************************************************************************/
/********************************** Configuration ******************************************/
/********************************************************************************************/
#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif
#ifndef VERBOSE
#define VERBOSE 2
#endif
Expand Down
5 changes: 4 additions & 1 deletion conformance/interfaces/pthread_create/14-1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,13 @@
/********************************** Configuration ******************************************/
/********************************************************************************************/
#ifndef VERBOSE
#define VERBOSE 1
#define VERBOSE 5
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif


/********************************************************************************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_detach/4-3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif


/********************************************************************************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_equal/2-1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif


/********************************************************************************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_getschedparam/4-1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif

/******************************************************************************/
/***************************** Test case *********************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_join/6-3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif


/********************************************************************************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_kill/8-1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif


/********************************************************************************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_mutex_lock/3-1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@
/********************************************************************************************/
/********************************** Configuration ******************************************/
/********************************************************************************************/
#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif
#ifndef VERBOSE
#define VERBOSE 1
#endif
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_mutex_trylock/4-3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif

/********************************************************************************************/
/*********************************** Test case *****************************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_once/6-1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif


/********************************************************************************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_setschedparam/5-1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif

/******************************************************************************/
/***************************** Test case *********************************/
Expand Down
3 changes: 3 additions & 0 deletions conformance/interfaces/pthread_sigmask/18-1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
#define VERBOSE 1
#endif

#ifndef __EMSCRIPTEN__
// See https://github.com/emscripten-core/emscripten/issues/14892
#define WITH_SYNCHRO
#endif


/********************************************************************************************/
Expand Down

0 comments on commit 869e266

Please sign in to comment.