3 files changed, 16 insertions, 15 deletions
diff --git a/tests/bugs/spirv-debug-info.slang b/tests/bugs/spirv-debug-info.slang
index 500299057..fe1c4fb05 100644
--- a/tests/bugs/spirv-debug-info.slang
+++ b/tests/bugs/spirv-debug-info.slang
@@ -1,5 +1,5 @@
-//TEST:SIMPLE(filecheck=CHECK):-target spirv -entry MainPs -stage fragment -profile glsl_450 -g3 -line-directive-mode none
-//TEST:SIMPLE(filecheck=CHECK-SPIRV):-target spirv -entry MainPs -stage fragment -profile glsl_450 -g3 -emit-spirv-directly
+//TEST:SIMPLE(filecheck=CHECK):-target spirv -entry MainPs -stage fragment -profile glsl_450 -g3 -line-directive-mode none -preserve-embedded-source
+//TEST:SIMPLE(filecheck=CHECK-SPIRV):-target spirv -entry MainPs -stage fragment -profile glsl_450 -g3 -emit-spirv-directly -preserve-embedded-source
 
 // make sure that the generated spirv has glsl source in it.
 // CHECK: #version 450
@@ -10,14 +10,14 @@
 // CHECK-SPIRV:  {{.*}} OpFunction
 // CHECK-SPIRV:  {{.*}} = OpExtInst %void {{.*}} DebugLine
 
-struct PS_OUTPUT 
-{ 
-    float4 vColor : SV_Target0 ; 
-} ; 
+struct PS_OUTPUT
+{
+    float4 vColor : SV_Target0 ;
+} ;
 
-PS_OUTPUT MainPs ( ) 
-{ 
-    PS_OUTPUT o ; 
-    o . vColor = float4 ( 0 , 0 , 0 , 0 ) ; 
-    return o ; 
-} 
-\ No newline at end of file
+PS_OUTPUT MainPs ( )
+{
+    PS_OUTPUT o ;
+    o . vColor = float4 ( 0 , 0 , 0 , 0 ) ;
+    return o ;
+}
diff --git a/tests/spirv/debug-info.slang b/tests/spirv/debug-info.slang
index dc225f8cc..d1107b774 100644
--- a/tests/spirv/debug-info.slang
+++ b/tests/spirv/debug-info.slang
@@ -27,4 +27,4 @@ void main()
 // CHECK: DebugFunctionDefinition
 // CHECK: DebugScope
 // CHECK: DebugLine
-// CHECK: DebugValue
+// CHECK: DebugDeclare
diff --git a/tests/spirv/debug-value-dynamic-index.slang b/tests/spirv/debug-value-dynamic-index.slang
index 591b1f6da..8b4f6b43e 100644
--- a/tests/spirv/debug-value-dynamic-index.slang
+++ b/tests/spirv/debug-value-dynamic-index.slang
@@ -1,4 +1,5 @@
-//TEST:SIMPLE(filecheck=CHECK):-target spirv -entry main -stage compute -g2 -emit-spirv-directly
+// This will be re-enabled when github #7693 is resolved
+//DISABLE_TEST:SIMPLE(filecheck=CHECK):-target spirv -entry main -stage compute -g2 -emit-spirv-directly
 
 struct TestType
 {
@@ -25,5 +26,5 @@ void main(int id : SV_DispatchThreadID)
 // CHECK: DebugTypeComposite
 // CHECK: DebugFunctionDefinition
 // CHECK: DebugScope
+// CHECK: DebugDeclare
 // CHECK: DebugLine
-// CHECK: DebugValue