From c0ae7b904dd9b4f911c3dc743f80b077ac999dc5 Mon Sep 17 00:00:00 2001
From: Mital Ashok <mital@mitalashok.co.uk>
Date: Thu, 4 Jul 2024 17:46:19 +0100
Subject: [PATCH] Update DR tests

---
 clang/test/CXX/drs/cwg16xx.cpp |  2 +-
 clang/test/CXX/drs/cwg2747.cpp | 11 +++++++++--
 clang/www/cxx_dr_status.html   |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/clang/test/CXX/drs/cwg16xx.cpp b/clang/test/CXX/drs/cwg16xx.cpp
index dca941fa30624f..9b9d4c0b271e06 100644
--- a/clang/test/CXX/drs/cwg16xx.cpp
+++ b/clang/test/CXX/drs/cwg16xx.cpp
@@ -537,7 +537,7 @@ namespace cwg1696 { // cwg1696: 7
 #endif
 }
 
-// cwg1698: yes
+// cwg1698: 2.7
 // This file intentionally does not end in a newline
 // to facilitate the CWG1698 test
 
diff --git a/clang/test/CXX/drs/cwg2747.cpp b/clang/test/CXX/drs/cwg2747.cpp
index 3f971452c5193f..59b4aae316ba3f 100644
--- a/clang/test/CXX/drs/cwg2747.cpp
+++ b/clang/test/CXX/drs/cwg2747.cpp
@@ -1,11 +1,18 @@
-// RUN: %clang_cc1 -std=c++11 -pedantic-errors -verify=expected %s -E | FileCheck %s --strict-whitespace --allow-empty
+// RUN: %clang_cc1 -std=c++98 -pedantic-errors -verify=cxx98 %s -E | FileCheck %s --strict-whitespace
+// RUN: %clang_cc1 -std=c++11 -pedantic-errors -verify=since-cxx11 %s -E | FileCheck %s --strict-whitespace
+// RUN: %clang_cc1 -std=c++17 -pedantic-errors -verify=since-cxx11 %s -E | FileCheck %s --strict-whitespace
+// RUN: %clang_cc1 -std=c++20 -pedantic-errors -verify=since-cxx11 %s -E | FileCheck %s --strict-whitespace
+// RUN: %clang_cc1 -std=c++23 -pedantic-errors -verify=since-cxx11 %s -E | FileCheck %s --strict-whitespace
+// RUN: %clang_cc1 -std=c++2c -pedantic-errors -verify=since-cxx11 %s -E | FileCheck %s --strict-whitespace
 
-// expected-no-diagnostics
+// since-cxx11-no-diagnostics
 // cwg2747: yes
 
 // Check that a newline is still added even though there is a
 // physical newline at the end of the file (which is spliced)
 // CHECK: int x;{{$[[:space:]]^}}int y;int z;{{$[[:space:]]^$}}
+// cxx98-error@+4 {{no newline at end of file}}
+// cxx98-note@+3 {{last newline deleted by splice here}}
 int x;
 int y;\
 int z;\
diff --git a/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html
index 2da096b746611e..efa8253282c008 100755
--- a/clang/www/cxx_dr_status.html
+++ b/clang/www/cxx_dr_status.html
@@ -10003,7 +10003,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
     <td><a href="https://cplusplus.github.io/CWG/issues/1698.html">1698</a></td>
     <td>DRWP</td>
     <td>Files ending in <TT>\</TT></td>
-    <td class="full" align="center">Yes</td>
+    <td class="full" align="center">Clang 2.7</td>
   </tr>
   <tr class="open" id="1699">
     <td><a href="https://cplusplus.github.io/CWG/issues/1699.html">1699</a></td>