Compare commits
	
		
			No commits in common. "debug/affinit-support-nix" and "master" have entirely different histories.
		
	
	
		
			debug/affi
			...
			master
		
	
		
							
								
								
									
										12
									
								
								nosv-disable-dtlock-test.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								nosv-disable-dtlock-test.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,12 @@
 | 
			
		||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
 | 
			
		||||
index 2b986743..ae424087 100644
 | 
			
		||||
--- a/tests/Makefile.am
 | 
			
		||||
+++ b/tests/Makefile.am
 | 
			
		||||
@@ -55,7 +55,6 @@ regression_tests = regression-attach-is.test \
 | 
			
		||||
 	regression-parallel-tasks-submission.test
 | 
			
		||||
 
 | 
			
		||||
 unit_tests = unit-backbone-pressure.test \
 | 
			
		||||
-	unit-dtlock.test \
 | 
			
		||||
 	unit-ring-buffer.test \
 | 
			
		||||
 	unit-heap.test
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										27
									
								
								release.nix
									
									
									
									
									
								
							
							
						
						
									
										27
									
								
								release.nix
									
									
									
									
									
								
							@ -17,6 +17,8 @@ let
 | 
			
		||||
            src = nosv;
 | 
			
		||||
            version = getVersion nosv;
 | 
			
		||||
 | 
			
		||||
            patches = (old.patches or []) ++ [ ./nosv-disable-dtlock-test.patch ];
 | 
			
		||||
 | 
			
		||||
            doCheck = true;
 | 
			
		||||
            inherit requiredSystemFeatures;
 | 
			
		||||
          });
 | 
			
		||||
@ -46,11 +48,36 @@ let
 | 
			
		||||
      ];
 | 
			
		||||
    }
 | 
			
		||||
  );
 | 
			
		||||
 | 
			
		||||
  tarballs = {
 | 
			
		||||
    # nosv = pkgs.releaseTools.sourceTarball {
 | 
			
		||||
    #   name = "nosv-tarball";
 | 
			
		||||
    #   inherit (pkgs.nosv) src version;
 | 
			
		||||
    #   preAutoconf = "sed -i 's/AC_MSG_RESULT/_AS_ECHO/' configure.ac";
 | 
			
		||||
    # };
 | 
			
		||||
  };
 | 
			
		||||
in
 | 
			
		||||
{
 | 
			
		||||
  pkgs = {
 | 
			
		||||
    inherit (pkgs)
 | 
			
		||||
      nosv
 | 
			
		||||
      ovni
 | 
			
		||||
      nodes
 | 
			
		||||
      nanos6
 | 
			
		||||
      ;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  inherit tarballs;
 | 
			
		||||
 | 
			
		||||
  sanitized.nosv = pkgs.nosv.overrideAttrs (old: {
 | 
			
		||||
    configureFlags = (old.configureFlags or []) ++ [
 | 
			
		||||
      "--enable-asan"
 | 
			
		||||
    ];
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  sanitized.nosv-ubsan = pkgs.nosv.overrideAttrs (old: {
 | 
			
		||||
    configureFlags = (old.configureFlags or []) ++ [
 | 
			
		||||
      "--enable-ubsan"
 | 
			
		||||
    ];
 | 
			
		||||
  });
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user