mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-11-03 09:01:54 -05:00 
			
		
		
		
	audioconvert tests: Default to using an installed libspa-support
This makes installed-tests (see commit b852b58f) do the right thing.
For build-time testing, spa/plugins/audioconvert/meson.build overrides
this with the SPA_PLUGIN_DIR environment variable, and for ad-hoc
testing by developers, pw-uninstalled.sh sets the necessary variables.
Signed-off-by: Simon McVittie <smcv@debian.org>
			
			
This commit is contained in:
		
							parent
							
								
									f7b22b934c
								
							
						
					
					
						commit
						8dcf76f661
					
				
					 5 changed files with 9 additions and 3 deletions
				
			
		| 
						 | 
					@ -22,6 +22,8 @@
 | 
				
			||||||
 * DEALINGS IN THE SOFTWARE.
 | 
					 * DEALINGS IN THE SOFTWARE.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <string.h>
 | 
					#include <string.h>
 | 
				
			||||||
#include <stdio.h>
 | 
					#include <stdio.h>
 | 
				
			||||||
#include <stdlib.h>
 | 
					#include <stdlib.h>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,6 +22,8 @@
 | 
				
			||||||
 * DEALINGS IN THE SOFTWARE.
 | 
					 * DEALINGS IN THE SOFTWARE.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <string.h>
 | 
					#include <string.h>
 | 
				
			||||||
#include <stdio.h>
 | 
					#include <stdio.h>
 | 
				
			||||||
#include <stdlib.h>
 | 
					#include <stdlib.h>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -127,7 +127,7 @@ foreach a : test_apps
 | 
				
			||||||
  test(a,
 | 
					  test(a,
 | 
				
			||||||
	executable(a, a + '.c',
 | 
						executable(a, a + '.c',
 | 
				
			||||||
		dependencies : [dl_lib, pthread_lib, mathlib ],
 | 
							dependencies : [dl_lib, pthread_lib, mathlib ],
 | 
				
			||||||
		include_directories : [spa_inc ],
 | 
							include_directories : [ configinc, spa_inc ],
 | 
				
			||||||
		link_with : [ audioconvert, test_lib, audioconvertlib ],
 | 
							link_with : [ audioconvert, test_lib, audioconvertlib ],
 | 
				
			||||||
		install_rpath : join_paths(spa_plugindir, 'audioconvert'),
 | 
							install_rpath : join_paths(spa_plugindir, 'audioconvert'),
 | 
				
			||||||
		c_args : [ simd_cargs, '-D_GNU_SOURCE' ],
 | 
							c_args : [ simd_cargs, '-D_GNU_SOURCE' ],
 | 
				
			||||||
| 
						 | 
					@ -159,7 +159,7 @@ foreach a : benchmark_apps
 | 
				
			||||||
  benchmark(a,
 | 
					  benchmark(a,
 | 
				
			||||||
	executable(a, a + '.c',
 | 
						executable(a, a + '.c',
 | 
				
			||||||
		dependencies : [dl_lib, pthread_lib, mathlib, ],
 | 
							dependencies : [dl_lib, pthread_lib, mathlib, ],
 | 
				
			||||||
		include_directories : [spa_inc ],
 | 
							include_directories : [ configinc, spa_inc ],
 | 
				
			||||||
		c_args : [ simd_cargs, '-D_GNU_SOURCE' ],
 | 
							c_args : [ simd_cargs, '-D_GNU_SOURCE' ],
 | 
				
			||||||
		link_with : [ audioconvert, audioconvertlib ],
 | 
							link_with : [ audioconvert, audioconvertlib ],
 | 
				
			||||||
		install_rpath : join_paths(spa_plugindir, 'audioconvert'),
 | 
							install_rpath : join_paths(spa_plugindir, 'audioconvert'),
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,6 +22,8 @@
 | 
				
			||||||
 * DEALINGS IN THE SOFTWARE.
 | 
					 * DEALINGS IN THE SOFTWARE.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <string.h>
 | 
					#include <string.h>
 | 
				
			||||||
#include <stdio.h>
 | 
					#include <stdio.h>
 | 
				
			||||||
#include <stdlib.h>
 | 
					#include <stdlib.h>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -38,7 +38,7 @@ static inline struct spa_handle *load_handle(const struct spa_support *support,
 | 
				
			||||||
	char *path;
 | 
						char *path;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if ((str = getenv("SPA_PLUGIN_DIR")) == NULL)
 | 
						if ((str = getenv("SPA_PLUGIN_DIR")) == NULL)
 | 
				
			||||||
		str = ".";
 | 
							str = PLUGINDIR;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	len = strlen(str) + strlen(lib) + 2;
 | 
						len = strlen(str) + strlen(lib) + 2;
 | 
				
			||||||
	path = alloca(len);
 | 
						path = alloca(len);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue